From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 15 Nov 2010 06:49:30 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~4857^2~23^2~104
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c94f28c383f58c9de74678e0f1624db9c5f8a8cb;p=mirror_ubuntu-zesty-kernel.git

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

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

c94f28c383f58c9de74678e0f1624db9c5f8a8cb