Merge remote branch 'airlied/drm-core-next' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 16 Dec 2010 21:02:15 +0000 (21:02 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 16 Dec 2010 21:02:15 +0000 (21:02 +0000)
commitd8c58fabd75021cdd99abcd96513cb088d41092b
treef6554ecfb27c0d50f5ae6acae3a7077282813cab
parent9c04f015ebc2cc2cca5a4a576deb82a311578edc
parentb08ebe7e776e5be0271ed1e1bbb384e1f29dd117
Merge remote branch 'airlied/drm-core-next' into drm-intel-next
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_object.c
include/drm/drmP.h