From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 16 Feb 2011 09:36:05 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.39-rc1~458^2~9^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9035a97a32836d0e456ddafaaf249a844e6e4b5e;p=pandora-kernel.git

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

Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.

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

9035a97a32836d0e456ddafaaf249a844e6e4b5e
Reading git-diff-tree failed