From: Dave Airlie <airlied@redhat.com>
Date: Thu, 15 Mar 2012 10:24:32 +0000 (+0000)
Subject: drm: Merge tag 'v3.3-rc7' into drm-core-next
X-Git-Tag: v3.4-rc1~143^2~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8229c885fe361e521ac64de36b16011e54a30de0;p=pandora-kernel.git

drm: Merge tag 'v3.3-rc7' into drm-core-next

Merge the fixes so far into core-next, needed to test
intel driver.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
---

8229c885fe361e521ac64de36b16011e54a30de0
Reading git-diff-tree failed