tree cb927908a099f6448f86871e3bbc3985139db6cd
parent 4fe70410d9a219dabb47328effccae7e7f2a6e26
parent c549e71d073a6e9a4847497344db28a784061455
author Linus Torvalds <torvalds@linux-foundation.org> 1238609611 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238609611 -0700

Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: ACPI 3, BIOS workaround for E820-probing code
  x86, setup: preemptively save/restore edi and ebp around INT 15 E820
  x86, setup: mark %esi as clobbered in E820 BIOS call