tree b08e2e80f8626efe0444c17adbaf3729a5469697
parent 6db602d447fb6c3aeb020c5dff5219de317f8bb4
parent 4221d014ea04d439e6d1e65951c3b406e7c1b7ab
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1188618063 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1188618063 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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