Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
commit1c62233508ef7104f8a78e571fdf5c72d0dc0200
authorDave Airlie <airlied@redhat.com>
Mon, 1 Mar 2010 06:22:38 +0000 (1 16:22 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 Mar 2010 06:22:38 +0000 (1 16:22 +1000)
tree31e19cbff5c1080d3015d20b24dd43ee95f4ed8c
parent6d9c13513661c1991bf5f4e6e1363c721292d819
parent6a9ee8af344e3bd7dbd61e67037096cdf7f83289
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
15 files changed:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/radeon/Makefile
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_bios.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/radeon/radeon_drv.h
drivers/gpu/drm/radeon/radeon_fb.c
drivers/gpu/drm/radeon/radeon_kms.c