From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 22 Feb 2011 15:58:46 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.39-rc1~458^2~9^2~12
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=710f957846cff998c681f3701f6f90eda896458f;p=~andy%2Flinux

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

Merge in the conflicting eDP fix.

Conflicts:
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

710f957846cff998c681f3701f6f90eda896458f