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-08-16 Here's what's likely the last bluetooth-next pull request for 4.3: - 6lowpan/802.15.4 refactoring, cleanups & fixes - Document 6lowpan netdev usage in Documentation/networking/6lowpan.txt - Support for UART based QCA Bluetooth controllers - Power management support for Broeadcom Bluetooth controllers - Change LE connection initiation to always use passive scanning first - Support for new Silicon Wave USB ID Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- Documentation/networking/6lowpan.txt 50 additions, 0 deletionsDocumentation/networking/6lowpan.txt
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/bluetooth/Kconfig 17 additions, 0 deletionsdrivers/bluetooth/Kconfig
- drivers/bluetooth/Makefile 2 additions, 0 deletionsdrivers/bluetooth/Makefile
- drivers/bluetooth/btmrvl_sdio.c 2 additions, 2 deletionsdrivers/bluetooth/btmrvl_sdio.c
- drivers/bluetooth/btqca.c 392 additions, 0 deletionsdrivers/bluetooth/btqca.c
- drivers/bluetooth/btqca.h 135 additions, 0 deletionsdrivers/bluetooth/btqca.h
- drivers/bluetooth/btusb.c 3 additions, 0 deletionsdrivers/bluetooth/btusb.c
- drivers/bluetooth/hci_bcm.c 308 additions, 2 deletionsdrivers/bluetooth/hci_bcm.c
- drivers/bluetooth/hci_ldisc.c 6 additions, 0 deletionsdrivers/bluetooth/hci_ldisc.c
- drivers/bluetooth/hci_qca.c 969 additions, 0 deletionsdrivers/bluetooth/hci_qca.c
- drivers/bluetooth/hci_uart.h 7 additions, 1 deletiondrivers/bluetooth/hci_uart.h
- drivers/net/ieee802154/at86rf230.c 14 additions, 38 deletionsdrivers/net/ieee802154/at86rf230.c
- drivers/net/ieee802154/cc2520.c 1 addition, 0 deletionsdrivers/net/ieee802154/cc2520.c
- include/net/6lowpan.h 23 additions, 0 deletionsinclude/net/6lowpan.h
- include/net/bluetooth/hci_core.h 29 additions, 0 deletionsinclude/net/bluetooth/hci_core.h
- include/net/cfg802154.h 8 additions, 0 deletionsinclude/net/cfg802154.h
- include/net/nl802154.h 4 additions, 0 deletionsinclude/net/nl802154.h
- net/6lowpan/Makefile 1 addition, 1 deletionnet/6lowpan/Makefile
- net/6lowpan/core.c 40 additions, 0 deletionsnet/6lowpan/core.c
Loading
Please register or sign in to comment