Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Apr 2011 20:39:49 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Apr 2011 20:39:49 +0000 (13:39 -0700)
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915/lvds: Remove 0xa0 DDC probe for LVDS
  drm/i915/crt: Remove 0xa0 probe for VGA


Trivial merge