Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2010 01:19:43 +0000 (18:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2010 01:19:43 +0000 (18:19 -0700)
commit3e6dce76d99b328716b43929b9195adfee1de00c
treebb91c554cc1187aeb19f9965f539331dcae18f65
parentfbc1487019d287bd869baac846dee97f39f8f07c
parentdd8849c8f59ec1cee4809a0c5e603e045abe860e
Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/ickle/drm-intel

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915: don't enable self-refresh on Ironlake
  drm/i915: Double check that the wait_request is not pending before warning
  Revert "drm/i915: Warn if we run out of FIFO space for a mode"
  Revert "drm/i915: Allow LVDS on pipe A on gen4+"
  Revert "drm/i915: Enable RC6 on Ironlake."