From: Dave Airlie <airlied@redhat.com>
Date: Fri, 20 Jul 2012 04:53:28 +0000 (-0400)
Subject: Merge tag 'v3.5-rc7' into drm-next
X-Git-Tag: v3.6-rc1~83^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6b0b6a82f9c93fe3dd060ae54719456474a74a3;p=pandora-kernel.git

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
---

e6b0b6a82f9c93fe3dd060ae54719456474a74a3
Reading git-diff-tree failed