Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2014 06:39:37 +0000 (22:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2014 06:39:37 +0000 (22:39 -0800)
commitba2cb64b55a46a3799fc698466f715ef6bf86fd6
treef0c75ea24de77cee2021c3c2edde0a736f80b6d5
parent56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2
parent3e3282c0a23d8eb9438dcf4ac908a5eb48c7038b
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm intel fixes from Dave Airlie:
 "Two intel stable fixes, that should be it from me for this round"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: Unlock panel even when LVDS is disabled
  drm/i915: More cautious with pch fifo underruns