Subject: linux-next: manual merge of the percpu tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 10 Dec 2010 13:32:12 +1100

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/x86/kernel/apic/nmi.c between commit
5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a ("x86, nmi_watchdog: Remove the
old nmi_watchdog") from the tip tree and commits
aa0be2afeed15edd653830ca87a3f173f08c23e6 ("x86: Use this_cpu_ops to
optimize code") and e5195e91d9b579ba9def00ea2e8b96189c0120f4 ("x86: Use
this_cpu_inc_return for nmi counter") from the percpu tree.

I just ignored the percpu changes to this file and removed it as the tip
tree did.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/