tree e61ccd3e257145844a56ce1567ec9eae63f7fcef
parent 2f19cad94cee3c9bd52d0c9ca584ef506302fb7c
parent 21124e5c52ecf87c3fdcb03855ec852563ce93cf
author Linus Torvalds <torvalds@linux-foundation.org> 1417393297 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1417393297 -0800

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Two i915 regressions and one dual-gpu laptop radeon fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: report disconnected for LVDS/eDP with PX if ddc fails
  drm/i915: Cancel vdd off work before suspend
  drm/i915: Ignore SURFLIVE and flip counter when the GPU gets reset