Hi all,

Today's linux-next merge of the stackprotector tree got conflicts in
arch/x86/include/asm/pda.h and arch/x86/include/asm/system.h against the
tip-core tree.

It looks like extensive changes have been made that have not been
propagated to the stackprotector tree yet, so I will drop it for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/