tree 554dd0e2f0a52802a60d3211234a0faeb88d25c0
parent 1ddc6dd855f01977e9e1795037fca1c8be028d24
parent 6ea76f3cade4734e73e3da842005820558b8b828
author Linus Torvalds <torvalds@linux-foundation.org> 1438703466 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1438703466 -0700

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