| commit | f235cead56ccc190e373be2287e20cff3078ce35 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 01 09:21:53 2015 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 01 09:21:53 2015 -0800 |
| tree | d269492797fe719e8edc666e18c09c07995cf6ac | |
| parent | a4861761e563568c2617851987eb2801dcc325f2 [diff] | |
| parent | a0e80fbd56b4573de997c9a088a33abbc1121400 [diff] |
Merge tag 'usb-serial-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus Johan writes: USB-serial fixes for v4.4-rc3 Here are some device-id fixes that remove a HID device from cp210x, and adds support for another Infineon flash-loader device. The flash-loader device presents itself as a CDC-ACM device even though it is clearly not, so we need to blacklist it in the cdc-acm driver as well. Signed-off-by: Johan Hovold <johan@kernel.org>