From: Greg Kroah-Hartman Date: Sat, 23 Aug 2014 15:42:00 +0000 (-0500) Subject: Merge tag 'usb-serial-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.17-rc3~11^2~17 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c3d3af52904b789cecd5a3915f0593bdbdc8dc58;p=~emulex%2Finfiniband.git Merge tag 'usb-serial-3.17-rc2' of git://git.kernel.org/pub/scm/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 --- c3d3af52904b789cecd5a3915f0593bdbdc8dc58