From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 14 Aug 2015 16:10:35 +0000 (+0200)
Subject: Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes
X-Git-Tag: omap-for-v4.3/fixes-rc1~89^2~28^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=622147fdad5425f6f572f84ce709303e5e0500b7;p=pandora-kernel.git

Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes

Backmerge drm-intel-fixes because a bunch of atomic patch backporting
we had to do lead to horrible conflicts.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
Just a bit of context conflict between -next and -fixes.
	drivers/gpu/drm/i915/intel_atomic.c
	drivers/gpu/drm/i915/intel_display.c
Atomic conflicts, always pick the code from -next.

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

622147fdad5425f6f572f84ce709303e5e0500b7
Reading git-diff-tree failed