Merge tag 'usb-serial-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Aug 2014 15:42:00 +0000 (10:42 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Aug 2014 15:42:00 +0000 (10:42 -0500)
commitc3d3af52904b789cecd5a3915f0593bdbdc8dc58
tree8791c7f50e95cd6bb3073c330bfb762735209127
parent6835a3a02b1ae222cbfb167a7e2d5e8df5e9854e
parent646907f5bfb0782c731ae9ff6fb63471a3566132
Merge tag 'usb-serial-3.17-rc2' of git://git./linux/kernel/git/johan/usb-serial into work-linus

Johan writes:

USB-serial fixes for v3.17-rc2

These updates fix the log level for some option log messages that started
bothering people after a recent change.

They also fix some issues reported against the zte_ev driver by moving most
device ids back from the zte_ev driver to the option driver (and removing two
duplicate ids). The zte_ev driver is planned to be removed in 3.18.

Some new device ids are also added.

Signed-off-by: Johan Hovold <johan@kernel.org>