Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2009 03:22:10 +0000 (17:22 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2009 03:22:10 +0000 (17:22 -1000)
commitb5af754405e8cb8b14b3f5958581ebf63c3601e9
tree52a64a53969c2fcd5ea2545cd74ece8c2eb24345
parentadda766193ea1cf3137484a9521972d080d0b7af
parentdb54501900ad3665dd669f5708ecd04fc5aed495
Merge branch 'for-linus' of git://git./linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: Improve CRTDDC mapping by using VBT info
  drm/i915: Fix CPU-spinning hangs related to fence usage by using an LRU.
  drm/i915: Set crtc/clone mask in different output devices
  drm/i915: Always use SDVO_B detect bit for SDVO output detection.
  drm/i915: Fix typo that broke SVID1 in intel_sdvo_multifunc_encoder()
  drm/i915: Check if BIOS enabled dual-channel LVDS on 8xx, not only on 9xx
  drm/i915: Set the multiplier for SDVO on G33 platform