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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serial/68360serial.c between commit d29f3ef39be4
("tty_lock: Localise the lock") from the tty tree and commit 60e6d2689c2a
("staging: evict abandoned 68360serial.c driver from the kernel") from
the staging tree.

The latter removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature