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

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

Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	include/drm/i915_drm.h
---

5aa7d52aebfc11760bbc5b081ed621227bb77981
Reading git-diff-tree failed