Merge remote branch 'airlied/drm-next' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Thu, 5 Nov 2009 23:04:06 +0000 (15:04 -0800)
committerEric Anholt <eric@anholt.net>
Thu, 5 Nov 2009 23:04:06 +0000 (15:04 -0800)
commit5b8f0be0dce012d190a53d55240fe3fde6306476
tree19fccf22b07730205e9b1d64e8e8f676a12b763a
parent43bcd61fae05fc6062b4f117c5adb1a72c9f8c57
parent4fe9676d1ae6639b5749140eba052261d363366b
Merge remote branch 'airlied/drm-next' into drm-intel-next
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600d.h
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_ttm.c
include/drm/drmP.h