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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in drivers/mmc/card/sdio_uart.c between commit 1e04b7ae709d19d5c9f69c64e1e30253018ce102 ("sdio_uart: coding style fixes") from the trivial tree and various commits from the tty tree.

I just used the tty tree version where they clashed.  Jiri, you might
consider sending that patch to Greg for the tty tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature