linux-next: manual merge of the akpm-current tree with the sparc tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/sbus/char/jsflash.c between commit 967f038e491b ("Sparc:
sparc_cpu_model isn't in asm/system.h any more [ver #2]") from the sparc
tree and commit 695f43eb1721 ("asm/system.h: sparc: sparc_cpu_model isn't
in asm/system.h any more") from the akpm-current tree.

I fixed it up (I used the version from the sparc tree) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpOOsyIZq3VX.pgp
Description: PGP signature