]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jul 2011 21:18:00 +0000 (14:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jul 2011 21:18:00 +0000 (14:18 -0700)
commitd1ca1a004822983e2fc702d5382b4b9a5527cfbe
treeced77f6c6a5f98bb8d441030813d5e336dd24fa4
parent620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc
parenta94919eaddaa3fede1df8563ce4d761a75374645
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915/ringbuffer: Idling requires waiting for the ring to be empty
  Revert "drm/i915: enable rc6 by default"
  drm/i915: Clean up i915_driver_load failure path
  drm/i915: Enable GPU reset on Ivybridge.
  drm/i915/dp: manage sink power state if possible
  drm/i915/dp: consolidate AUX retry code
  drm/i915/dp: remove DPMS mode tracking from DP
  drm/i915/dp: try to read receiver capabilities 3 times when detecting
  drm/i915/dp: read more receiver capability bits on hotplug
  drm/i915/dp: use DP DPCD defines when looking at DPCD values
  drm/i915/dp: retry link status read 3 times on failure