From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 3 Oct 2010 09:56:11 +0000 (+0100)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.37-rc1~92^2~28^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58e10eb92d36a62568349d985c9140d9be16a99c;p=pandora-kernel.git

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

Conflicts:
	drivers/gpu/drm/i915/i915_gem_evict.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_dp.c
---

58e10eb92d36a62568349d985c9140d9be16a99c
Reading git-diff-tree failed