Merge branch 'for-upstream' of...
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next Johan Hedberg says: ==================== pull request: bluetooth-next 2015-10-22 Here's probably the last bluetooth-next pull request for 4.4. Among several other changes it contains the rest of the fixes & cleanups from the Bluetooth UnplugFest (that didn't need to be hurried to 4.3). - Refactoring & cleanups to 6lowpan code - New USB ids for two Atheros controllers and BCM43142A0 from Broadcom - Fix (quirk) for broken Broadcom BCM2045 controllers - Support for latest Apple controllers - Improvements to the vendor diagnostic message support Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- drivers/bluetooth/Kconfig 1 addition, 1 deletiondrivers/bluetooth/Kconfig
- drivers/bluetooth/ath3k.c 4 additions, 0 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/btbcm.c 13 additions, 4 deletionsdrivers/bluetooth/btbcm.c
- drivers/bluetooth/btintel.c 127 additions, 0 deletionsdrivers/bluetooth/btintel.c
- drivers/bluetooth/btintel.h 24 additions, 0 deletionsdrivers/bluetooth/btintel.h
- drivers/bluetooth/btusb.c 288 additions, 18 deletionsdrivers/bluetooth/btusb.c
- drivers/bluetooth/hci_ath.c 1 addition, 0 deletionsdrivers/bluetooth/hci_ath.c
- drivers/bluetooth/hci_bcm.c 3 additions, 2 deletionsdrivers/bluetooth/hci_bcm.c
- drivers/bluetooth/hci_intel.c 2 additions, 0 deletionsdrivers/bluetooth/hci_intel.c
- drivers/bluetooth/hci_ldisc.c 7 additions, 0 deletionsdrivers/bluetooth/hci_ldisc.c
- drivers/bluetooth/hci_qca.c 1 addition, 0 deletionsdrivers/bluetooth/hci_qca.c
- drivers/bluetooth/hci_uart.h 1 addition, 0 deletionsdrivers/bluetooth/hci_uart.h
- include/net/6lowpan.h 63 additions, 159 deletionsinclude/net/6lowpan.h
- include/net/bluetooth/hci.h 10 additions, 0 deletionsinclude/net/bluetooth/hci.h
- include/net/bluetooth/hci_core.h 27 additions, 4 deletionsinclude/net/bluetooth/hci_core.h
- include/net/mac802154.h 10 additions, 0 deletionsinclude/net/mac802154.h
- net/6lowpan/iphc.c 464 additions, 213 deletionsnet/6lowpan/iphc.c
- net/6lowpan/nhc.c 7 additions, 9 deletionsnet/6lowpan/nhc.c
- net/6lowpan/nhc.h 5 additions, 7 deletionsnet/6lowpan/nhc.h
- net/6lowpan/nhc_udp.c 21 additions, 1 deletionnet/6lowpan/nhc_udp.c
Loading
Please register or sign in to comment