From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 10 Mar 2014 20:43:46 +0000 (+0100)
Subject: Merge tag 'v3.14-rc6' into drm-intel-next-queued
X-Git-Tag: v3.15-rc1~51^2~18^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8e6e6012d68c4967e8f26fdd39ac95c247d4789;p=pandora-kernel.git

Merge tag 'v3.14-rc6' into drm-intel-next-queued

Linux 3.14-rc6

I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next tree

Conflicts:
	drivers/gpu/drm/i915/Makefile
	drivers/gpu/drm/i915/intel_dp.c

Makefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

e8e6e6012d68c4967e8f26fdd39ac95c247d4789
Reading git-diff-tree failed