Merge branch 'drm-core-next' of ../linux-2.6 into drm-next

diff --cc drivers/gpu/drm/radeon/r100.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600d.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_asic.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge