]> 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>
Tue, 8 May 2012 18:20:47 +0000 (11:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 May 2012 18:20:47 +0000 (11:20 -0700)
commit789505b05752239d957dbfa84b183e0d7a641952
tree726e3f1e17ec6a3d8c05739d9edf9534103b18fd
parent4ed6cedeefe8bbcad7c446db939450a6c902c16d
parentec9b3a9de6b2a8a08c5250b466db92adf82b8d65
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Two fixes from Intel, one a regression, one because I merged an early
  version of a fix.

  Also the nouveau revert of the i2c code that was tested on the list."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack
  drm/i915: Do no set Stencil Cache eviction LRA w/a on gen7+
  drm/i915: disable sdvo hotplug on i945g/gm