From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 21 Sep 2010 10:19:32 +0000 (+0100)
Subject: Merge branch 'drm-intel-fixes' into HEAD
X-Git-Tag: v2.6.37-rc1~92^2~28^2~111
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9e5f8e8d373e72f5c39dafde1ce110fc7082118;p=pandora-kernel.git

Merge branch 'drm-intel-fixes' into HEAD

Conflicts:
	drivers/char/agp/intel-agp.c
	drivers/gpu/drm/i915/intel_crt.c
---

e9e5f8e8d373e72f5c39dafde1ce110fc7082118
Reading git-diff-tree failed