tree 1b25626dacb31bc7004d5fd455a13be14a605fb1
parent 299297c63686948aab5af1534629a0a740af6688
parent e4a5d54f924ea5ce2913d9d0687d034004816465
author Linus Torvalds <torvalds@linux-foundation.org> 1243374516 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243374516 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: Add support for VGA load detection (pre-945).
  drm/i915: Use an I2C algo to do the flip to SDVO DDC bus.
  drm/i915: Determine type before initialising connector
  drm/i915: Return SDVO LVDS VBT mode if no EDID modes are detected.
  drm/i915: Fetch SDVO LVDS mode lines from VBT, then reserve them
  i915: support 8xx desktop cursors
  drm/i915: allocate large pointer arrays with vmalloc