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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 31 Dec 2010 13:55:23 +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 a couple of commits from the
percpu tree.

The former commit removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/