linux-next: manual merge of the sh tree with Linus' tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the sh tree got a conflict in
drivers/tty/serial/sh-sci.c between commit fc97114b8d67 ("sh: Fix boot
crash related to SCI") from Linus' tree and commit ad75b88ac379 ("serial:
sh-sci: Fix up default regtype probing") from the sh tree.

These do the same thing slightly differently ("ret" v. "ret != 0").  I
used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature