Subject: linux-next: manual merge of the generic-ipi tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 8 Jul 2008 02:46:52 +1000

Hi Ingo,

Today's linux-next merge of the generic-ipi tree got a conflict in
arch/x86/kernel/setup.c between commit
f31174007a74d6866968a37520c40e7d0e11cb5a ("Merge commit
'pci/linux-next'") from the merge of the pci tree and commit
a37ec98ac0a44bd0314c20ce866a33091055a6b6 ("x86: move reserve_setup_data
to setup.c") from the generic-ipi tree.

Just a contextual conflict.  I fixed it up and will carry the fix.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/