Merge remote branch 'airlied/drm-core-next' into drm-intel-next
Chris Wilson [Thu, 16 Dec 2010 21:02:15 +0000 (21:02 +0000)]
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge