From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Dec 2014 00:21:37 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~176^2~2805
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df20ce5a6fa618e236ff6b33ee88413d6f1bfa0a;p=firefly-linux-kernel-4.4.55.git

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

df20ce5a6fa618e236ff6b33ee88413d6f1bfa0a