linux-next: manual merge of the percpu tree with the sh tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/sh/kernel/vmlinux.lds.S between commit
2802e34590f290173a3f2aa5a4d662ae5373b420 ("sh: Clean up linker script
using new linker script macros") from the sh tree and commit
023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 ("linker script: unify usage of
discard definition") from the percpu tree.

It looks like the latter is a superset of the former, so I used it.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature