Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
commit628506c8de058f94297dae1f8ef8caaea29c4369
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 2 Aug 2007 21:07:57 +0000 (2 14:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 2 Aug 2007 21:07:57 +0000 (2 14:07 -0700)
tree634ea85f4bc826a7a5b6720f9c12a1b84a05cbea
parent370504cf7c68b953de55c41d5e0be97d30f3cf00
parentc3887cd7253299cac2a6dc5ea792613a5ba5bf6a
Merge branch 'for-linus' of git://git./linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] Document grub < 0.93 as broken
  [x86 setup] EDD: add missing =m constraint
  [x86 setup] video setup: Fix VBE DDC reading