From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Jul 2015 19:11:01 +0000 (-0700)
Subject: Merge tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel
X-Git-Tag: v4.14-rc1~4957
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23ff9e19febc816363f0a71fe4d1e5c863c07f9f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel

Pull drm intel fixes from Daniel Vetter:
 "I delayed my -fixes pull a bit hoping that I could include a fix for
  the dp mst stuff but looks a bit more nasty than that.  So just 3
  other regression fixes, one 4.2 other two cc: stable"

* tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Declare the swizzling unknown for L-shaped configurations
  drm/i915: Mark PIN_USER binding as GLOBAL_BIND without the aliasing ppgtt
  drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop
---

23ff9e19febc816363f0a71fe4d1e5c863c07f9f