diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-11 02:31:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-11 02:31:11 -0500 |
commit | 35eeacf1820a08305c2b0960febfa190f5a6dd63 (patch) | |
tree | f1227c7384ee01d3f029cc5f82223234e6456c5f /net/bluetooth/cmtp | |
parent | bed45f79a2afc9d7c279b880dfcac8f27d513b50 (diff) | |
parent | 1ee18329fae936089c6c599250ae92482ff2b81f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bluetooth/cmtp')
parent | d07830db1bdb254e4b50d366010b219286b8c937 (diff) |
---|
Merge tag 'usb-serial-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.10-rc7
One more device ID for pl2303.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/dwc2/Kconfig')