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)
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


Trivial merge