diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-21 17:28:50 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-21 17:28:50 +0100 |
commit | ca942a0ed019f98c156cdb3de78b3d76bf381b12 (patch) | |
tree | dedf386a825a51575d5b8b1a8211000a0803de0c /drivers/usb/musb/cppi_dma.h | |
parent | c9835df3e355bc43d0b756c668bbac7a0ba8df69 (diff) | |
parent | 8d7fa3d4ea3f0ca69554215e87411494e6346fdc (diff) | |
download | linux-ca942a0ed019f98c156cdb3de78b3d76bf381b12.tar.bz2 |
Merge tag 'usb-serial-5.1-rc1-2' of https://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/usb/musb/cppi_dma.h')
0 files changed, 0 insertions, 0 deletions