OSDN Git Service

Merge tag 'usb-serial-5.1-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Feb 2019 16:28:50 +0000 (17:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Feb 2019 16:28:50 +0000 (17:28 +0100)
commitca942a0ed019f98c156cdb3de78b3d76bf381b12
treededf386a825a51575d5b8b1a8211000a0803de0c
parentc9835df3e355bc43d0b756c668bbac7a0ba8df69
parent8d7fa3d4ea3f0ca69554215e87411494e6346fdc
Merge tag 'usb-serial-5.1-rc1-2' of https://git./linux/kernel/git/johan/usb-serial into usb-next

Johan writes:

USB-serial fixes for 5.1-rc1

Here are a couple of new device ids for 5.1-rc1.

All have been in linux-next with no reported issues.

Signed-off-by: Johan Hovold <johan@kernel.org>
* tag 'usb-serial-5.1-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485
  USB: serial: cp210x: add ID for Ingenico 3070
drivers/usb/serial/cp210x.c