From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 18 Jan 2016 07:04:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2da80b57c69a2a5ae0e16dead8cdbfab46f970bc;p=linux.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Pull in Dave's drm-next pull request to have a clean base for 4.6.
Also, we need the various atomic state extensions Maarten recently
created.

Conflicts are just adjacent changes that all resolve to nothing in git
diff.

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

2da80b57c69a2a5ae0e16dead8cdbfab46f970bc
diff --cc drivers/gpu/drm/i915/intel_hdmi.c
index d4ed7aa9927e4,62141751c2f09..8698a643d027f
mode 100755,100644..100755
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c