From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 21 Oct 2014 12:32:55 +0000 (+0200)
Subject: Merge branch 'drm-intel-next-fixes' into drm-intel-next
X-Git-Tag: omap-for-v3.19/fixes-rc1~80^2~79^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8cbd4597799ade2b8a656dac7768c352b58e43a;p=pandora-kernel.git

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

So I've sent the first pull request to Dave and I expect his request
for a merge tree any second now ;-)

More seriously I have some pending patches for 3.19 that depend upon
both trees, hence backmerge. Conflicts are all trivial.

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

v2: Of course I've forgotten the fixup script for the silent conflict.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

a8cbd4597799ade2b8a656dac7768c352b58e43a
Reading git-diff-tree failed