]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
Need this to avoid conflicts with future radeon fixes

15 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge