721292d819
parent 6a9ee8af344e3bd7dbd61e67037096cdf7f83289
author Dave Airlie <airlied@redhat.com> 1267424558 +1000
committer Dave Airlie <airlied@redhat.com> 1267424558 +1000

Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage

* '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