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

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

Conflicts:
	drivers/gpu/drm/i915/intel_drv.h
---

b9e68670cc3a13166b389ce847af19b0d0d33c67
Reading git-diff-tree failed