]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2014 00:21:37 +0000 (16:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2014 00:21:37 +0000 (16:21 -0800)
commitdf20ce5a6fa618e236ff6b33ee88413d6f1bfa0a
treee61ccd3e257145844a56ce1567ec9eae63f7fcef
parent2f19cad94cee3c9bd52d0c9ca584ef506302fb7c
parent21124e5c52ecf87c3fdcb03855ec852563ce93cf
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