diff options
| author | David S. Miller | 2018-10-20 12:33:48 -0700 |
|---|---|---|
| committer | David S. Miller | 2018-10-20 12:33:48 -0700 |
| commit | 342149c557e16d72aefa440143abc8560dc687cc (patch) | |
| tree | 31c1f35378d53d0364633f98373f807428e290be /include/net/timewait_sock.h | |
| parent | a4efbaf6225577fd40940a4542d69bb5e79f88ad (diff) | |
| parent | c614ca3f7476934de54dd731e09d094ad822696c (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2018-10-20
Here's one more bluetooth-next pull request for the 4.20 kernel.
- Added new USB ID for QCA_ROME controller
- Added debug trace support from QCA wcn3990 controllers
- Updated L2CAP to conform to latest Errata Service Release
- Fix binding to non-removable BCM43430 devices
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/timewait_sock.h')
0 files changed, 0 insertions, 0 deletions