]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 2 Aug 2007 21:07:57 +0000 (14:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 2 Aug 2007 21:07:57 +0000 (14:07 -0700)
* '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


Trivial merge