From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Jan 2016 19:36:26 +0000 (-0800)
Subject: Merge tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel

Pull i915 drm fixes from Jani Nikula:
 "Two display fixes still for v4.4.

  The new year's resolution is to start using signed tags per Linus'
  request.  This one is still unsigned; I want to fix this up in our
  maintainer scripts instead of doing it one-off"

* tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: increase the tries for HDMI hotplug live status checking
  drm/i915: Unbreak check_digital_port_conflicts()
---

4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7