]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6/ into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 6 Dec 2011 11:42:12 +0000 (11:42 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 6 Dec 2011 11:42:12 +0000 (11:42 +0000)
commit4b35130208c55f0a1f24b5273cf2e8eeaba3ab06
tree0dbe09fd0666cde725f60eba9ecdd2af28e0c2a2
parent32faa34dc5ed121a1e927753dcbf0ad395d3a956
parent4ce4e15ad1815f57691f3ae0e2d42c825d962dcc
Merge branch 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6/ into drm-core-next

Merge in master fixes as needed for testing on some hardware.

Conflicts:
drivers/gpu/drm/nouveau/nouveau_sgdma.c
18 files changed:
drivers/gpu/drm/Kconfig
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_drv.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
include/drm/drmP.h
include/drm/drm_mode.h