From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 28 Nov 2010 15:37:17 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.38-rc1~419^2~23^2~55
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3619df035ec9280314fae44032a6167f16ec38d2;p=pandora-kernel.git

Merge branch 'drm-intel-fixes' into drm-intel-next

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

3619df035ec9280314fae44032a6167f16ec38d2
Reading git-diff-tree failed