]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit97cbc2a4facba1af667f572f583a79453a91a57d
tree31e19cbff5c1080d3015d20b24dd43ee95f4ed8c
parent42fc3c52861d59e509e9ef63572c0ff5b187847b
parentc9062e65efab94465a11ab24fbd3ad084bf893fd
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