From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 22 Nov 2010 08:51:36 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.38-rc1~419^2~23^2~100^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e624ae8e0d4243e71daedce7570e91290438eaca;p=pandora-kernel.git

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

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

e624ae8e0d4243e71daedce7570e91290438eaca
Reading git-diff-tree failed