From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Aug 2015 15:51:06 +0000 (-0700)
Subject: Merge tag 'topic/mst-fixes-2015-08-04' of git://anongit.freedesktop.org/drm-intel
X-Git-Tag: v4.14-rc1~4936
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50d091b6bfb95dbfcaaf0f116b40fdcad83b2ee4;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'topic/mst-fixes-2015-08-04' of git://anongit.freedesktop.org/drm-intel

Pull drm mst fixes from Daniel Vetter:
 "Special pull request for mst fixes since most of the patches touch
  code outside of i915 proper.  DRM parts have also been reviewed by
  Thierry (nvidia) since Dave's enjoying vacations"

* tag 'topic/mst-fixes-2015-08-04' of git://anongit.freedesktop.org/drm-intel:
  drm/atomic-helpers: Make encoder picking more robust
  drm/dp-mst: Remove debug WARN_ON
  drm/i915: Fixup dp mst encoder selection
  drm/atomic-helper: Add an atomice best_encoder callback
---

50d091b6bfb95dbfcaaf0f116b40fdcad83b2ee4