tree ddeb5ad21697327a2bdff83fbe97ce7c12e56819
parent 899631c7916b231ba6509c90dbc33221e9194029
parent a6737ad15b4acf88bbf7753e929faf215adeaa3a
author Linus Torvalds <torvalds@linux-foundation.org> 1302035989 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302035989 -0700

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/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/lvds: Remove 0xa0 DDC probe for LVDS
  drm/i915/crt: Remove 0xa0 probe for VGA