linux-next: manual merge of the ttydev tree

[Just added some cc's]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/usb-serial.c between commits
0eb943841bdeb2210058e899cef11f6084bedf82 ("USB: usb dev_name() instead of
dev->bus_id"), c19b07f9e5990423131d0435b303e572dc3132d0 ("USB: usb
dev_set_name() instead of dev->bus_id") and
26a8abb358ae6110b8c46afc40a85e6f47bc8eeb ("USB: fix usb serial pm counter
decrement for disconnected interfaces") from the usb tree and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
ca66d73b800beb3bd391d9109ee13612755305cf ("44-tty-tidy-usb-serial")from
the ttydev tree.

The fixups were fairy obvious.  I can carry them.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/