tree e17b6130a1df035e08f6c930fc31c24017bca9f4
parent 5220cc9382e11ca955ce946ee6a5bac577bb14ff
parent 483f1798998ede75b2575cc1813c3d89ba64a34e
author Linus Torvalds <torvalds@linux-foundation.org> 1308978100 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308978100 -0700

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: save/resume forcewake lock fixes
  Revert "drm/i915: Kill GTT mappings when moving from GTT domain"
  drm/i915: Apply HWSTAM workaround for BSD ring on SandyBridge
  drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again)