Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 16:57:13 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 16:57:13 +0000 (09:57 -0700)
commit25b210371f76ac63b30d998549f5f4891d805f3b
treeb8a90dba0876716bdd56bf478c6949249e4a55dd
parentec616048ea21da2b32ed1a820e637c74c61c618c
parent5c72d064f7ead1126bed6faab0c2bfb7418036e2
Merge branch 'drm-intel-fixes' of git://git./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: Initialise g4x watermarks for disabled pipes
  drm/i915: Sanitize the output registers after resume
  drm/i915/tv: Fix modeset flickering introduced in 7f58aabc3
  drm/i915/tv: Only poll for TV connections
  drm/i915/tv: Remember the detected TV type