Merge tag 'v3.5-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 20 Jul 2012 04:53:28 +0000 (00:53 -0400)
committerDave Airlie <airlied@redhat.com>
Fri, 20 Jul 2012 04:53:28 +0000 (00:53 -0400)
commite6b0b6a82f9c93fe3dd060ae54719456474a74a3
tree89528134f61971718b1fa363b54bc3c7cebf1392
parent83bc5fd29afff5898cadf87fb29eb9260eecc63e
parent84a1caf1453c3d44050bd22db958af4a7f99315c
Merge tag 'v3.5-rc7' into drm-next

Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c
drivers/gpu/drm/radeon/radeon_gem.c
drivers/gpu/drm/radeon/si.c