Subject: linux-next: manual merge of the x86 tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Jul 2008 13:41:11 +1000

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/Kconfig between commit efac41894df57d32b483ac622d03541b5b2692c0
("x86: fix NODES_SHIFT Kconfig range") from Linus' tree and commit
dfdf1d75efee39e9396f8384c6f3bf555349ed60 ("x86: modify Kconfig to allow
up to 4096 cpus") from the x86 tree.

I took the version from the x86 tree.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/