Subject: linux-next: manual merge of the tip-core tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Aug 2008 11:08:20 +1000

Hi all,

Today's linux-next merge of the tip-core tree got a conflict in
include/asm-generic/vmlinux.lds.h between commit
c6de002617c199f80f9a2a713dffc263bdc69b81 ("Missing symbol prefix on
vmlinux.lds.h") from Linus' tree and commit
d3794979a8a80c222ce9d016a6dfc4bed36965d0 ("Zero based percpu:
infrastructure to rebase the per cpu area to zero") from the tip-core
tree.

Just simple overlapping changes,  I fixed it up.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/