aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_request.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-01 09:21:53 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-01 09:21:53 -0800
commitf235cead56ccc190e373be2287e20cff3078ce35 (patch)
treed269492797fe719e8edc666e18c09c07995cf6ac /net/bluetooth/hci_request.c
parenta4861761e563568c2617851987eb2801dcc325f2 (diff)
parenta0e80fbd56b4573de997c9a088a33abbc1121400 (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>
Diffstat (limited to 'net/bluetooth/hci_request.c')
0 files changed, 0 insertions, 0 deletions