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)
commit2f81eccbd7a5440b43ff874c8f02d6143f41ba4f
treeb08e2e80f8626efe0444c17adbaf3729a5469697
parent6db602d447fb6c3aeb020c5dff5219de317f8bb4
parent4221d014ea04d439e6d1e65951c3b406e7c1b7ab
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] Don't rely on the VESA BIOS being register-clean