From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Apr 2011 16:57:13 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith... 
X-Git-Tag: v2.6.39-rc5~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25b210371f76ac63b30d998549f5f4891d805f3b;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

25b210371f76ac63b30d998549f5f4891d805f3b