tree ba22ee7b469dd0cee974019cc32630838691f3af
parent e953fd7bb32f55309a96abd5ceba9cf68d221434
parent 011b9910bdaf2e52c48c012490ab444fceea1959
author Chris Wilson <chris@chris-wilson.co.uk> 1298390326 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1298390943 +0000

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>