From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 19 Mar 2014 14:54:37 +0000 (+0100)
Subject: Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued
X-Git-Tag: v3.15-rc1~51^2~18^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35;p=pandora-kernel.git

Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued

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

A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.

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

b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35
Reading git-diff-tree failed