From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 23 Jan 2011 17:24:26 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2;p=deliverable%2Flinux.git

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

Merge important suspend and resume regression fixes and resolve the
small conflict.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
---

bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2