summaryrefslogtreecommitdiff
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-03-07 10:51:14 -0500
committerDavid S. Miller <davem@davemloft.net>2018-03-07 10:51:14 -0500
commit89036a2a9852f70dcec97d5962974fe806828382 (patch)
tree664636cc767a85f98613a5178b564df4afafeddb /drivers/net/usb
parent803fafbe0cd522fa6b9e41ca3b96cfb2e2a2222d (diff)
parent64e759f58f128730b97a3c3a26d283c075ad7c86 (diff)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says: ==================== pull request: bluetooth 2018-03-05 Here are a few more Bluetooth fixes for the 4.16 kernel: - btusb: reset/resume fixes for Yoga 920 and Dell OptiPlex 3060 - Fix for missing encryption refresh with the Security Manager protocol ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
0 files changed, 0 insertions, 0 deletions