Merge tag 'v2.6.35-rc6' into drm-radeon-next
authorDave Airlie <airlied@redhat.com>
Mon, 2 Aug 2010 00:05:18 +0000 (10:05 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 2 Aug 2010 00:05:24 +0000 (10:05 +1000)
commitd656ae53f64cb0f01dac8a02c4d31453d64ef97c
treecf641d4e5828b8f7c430b42657237c5daf9571fd
parent167ffc44caaee68ea60dadf6931a4d195a4ed1f0
parentb37fa16e78d6f9790462b3181602a26b5af36260
Merge tag 'v2.6.35-rc6' into drm-radeon-next

Need this to avoid conflicts with future radeon fixes
15 files changed:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r520.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600_cs.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_combios.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_kms.c
drivers/gpu/drm/radeon/rs400.c
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv515.c