Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 18 Nov 2009 00:09:55 +0000 (10:09 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 18 Nov 2009 00:09:55 +0000 (10:09 +1000)
commit46557bef3f3834ac33031c7be27d39d90d507442
tree5cfc4a9e1263fe0a15e516ca9695ee2f9b8899e4
parent4efc50d697ed8d9a91f0005d922907a7b6c9290d
parentd91d8a3f88059d93e34ac70d059153ec69a9ffc7
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
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_asic.h
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_ttm.c