linux-next: manual merge of the x86 tree with Linus' tree
From: Stephen Rothwell
Date: Mon May 25 2009 - 20:53:07 EST
Today's linux-next merge of the x86 tree got a conflict in
arch/x86/boot/memory.c between commit
bca23dba760d6705c013f89113c46570378fb626 ("x86, setup: revert ACPI 3 E820
extended attributes support") from Linus' tree and commit
df7699c56421c0476704f24a43409ac8c505f3d2 ("x86, setup: "glove box" BIOS
interrupts in the core boot code") from the x86 tree.
The former removed the code that the latter modified, so I used the
former (as is done in -tip).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature