linux-next: manual merge of the trivial tree with the sparc tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/sparc/kernel/leon_kernel.c between commit
0da2b300b91ddeb9944c3fb4faaf78c1c482c0af ("sparc: remove trailing space
in messages") from the sparc tree and commit
3ad2f3fbb961429d2aa627465ae4829758bc7e07 ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former also fixed the spelling mistake fixed by the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature