Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
commit9c9cb14387389a70fe40f9be99f243e2a410b0b7
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Apr 2009 18:13:31 +0000 (1 11:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Apr 2009 18:13:31 +0000 (1 11:13 -0700)
treecb927908a099f6448f86871e3bbc3985139db6cd
parent4fe70410d9a219dabb47328effccae7e7f2a6e26
parentc549e71d073a6e9a4847497344db28a784061455
Merge branch 'x86/setup' of git://git./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