From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 7 Mar 2011 12:32:44 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.39-rc1~458^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47ae63e0c2e5fdb582d471dc906eb29be94c732f;p=pandora-kernel.git

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

Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
---

47ae63e0c2e5fdb582d471dc906eb29be94c732f
Reading git-diff-tree failed