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

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

Immediate merge to resolve conflicts from applying a stability fix to
both branches.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/gpu/drm/i915/intel_ringbuffer.h
---

8c1812ad4879676bec1bd20f8ff478c8a076f3fc
Reading git-diff-tree failed