From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 1 Nov 2010 13:42:29 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca;p=linux-beck.git

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

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_evict.c
---

f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca