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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Jul 2008 17:31:31 +1000

Hi Dave,

Today's linux-next merge of the sparc tree got a conflict in
include/asm-sparc/smp.h between commit
8691e5a8f691cc2a4fda0651e8d307aaba0e7d68 ("smp_call_function: get rid of
the unused nonatomic/retry argument") from Linus' tree and commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree.

I applied the part of the patch from Linus' tree to asm-sparc/smp_32.h.

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