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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 17 Jul 2008 11:43:40 +1000

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/kernel/Makefile between commit
db104c724b370804d3ad736f0ef1cda46825d058 ("Merge branch 'linus' into
stackprotector") from the stackprotector tree and commit
34646bca474142e1424e5f6c4a33cb2ba0930ea1 ("x86, paravirt-spinlocks: fix
boot hang") from the x86 tree.

I fixed it up as Ingo suggested.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/