Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Sep 2007 03:41:03 +0000 (20:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Sep 2007 03:41:03 +0000 (20:41 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] Don't rely on the VESA BIOS being register-clean


Trivial merge