Merge tag 'v2.6.35-rc6' into drm-radeon-next

Need this to avoid conflicts with future radeon fixes

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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