diff options
author | 2017-06-14 15:22:17 -0400 | |
---|---|---|
committer | 2017-06-14 15:22:17 -0400 | |
commit | 4cbf87c78950b439df599053214b09d8f7461765 (patch) | |
tree | 7d13452d148918dc489eddf82c1e53b2cc4ee8dd /include/linux/socket.h | |
parent | qed: Fix an off by one bug (diff) | |
parent | Bluetooth: btusb: Add support for 0489:e0a2 QCA_ROME device (diff) | |
download | wireguard-linux-4cbf87c78950b439df599053214b09d8f7461765.tar.xz wireguard-linux-4cbf87c78950b439df599053214b09d8f7461765.zip |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-06-14
Here's another batch of Bluetooth patches for the 4.13 kernel:
- Fix for Broadcom controllers not supporting Event Mask Page 2
- New QCA ROME USB ID for btusb
- Fix for Security Manager Protocol to use constant-time memcmp
- Improved support for TI WiLink chips
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/socket.h')
0 files changed, 0 insertions, 0 deletions