Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
authorDave Airlie <airlied@redhat.com>
Mon, 1 Mar 2010 06:22:38 +0000 (16:22 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 Mar 2010 06:22:38 +0000 (16:22 +1000)
* 'gpu-switcher' of /ssd/git//linux-2.6:
  vga_switcheroo: initial implementation (v15)
  fb: for framebuffer handover don't exit the loop early.

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/radeon/Makefile
drivers/gpu/drm/radeon/radeon.h


Trivial merge