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-12-11 Here's another set of Bluetooth & 802.15.4 patches for the 4.5 kernel: - 6LoWPAN debugfs support - New 802.15.4 driver for ADF7242 MAC IEEE802154 - Initial code for 6LoWPAN Generic Header Compression (GHC) support - Refactor Bluetooth LE scan & advertising behind dedicated workqueue - Cleanups to Bluetooth H:5 HCI driver - Support for Toshiba Broadcom based Bluetooth controllers - Use continuous scanning when establishing Bluetooth LE connections Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/ieee802154/adf7242.txt 18 additions, 0 deletionsDocumentation/devicetree/bindings/net/ieee802154/adf7242.txt
- MAINTAINERS 9 additions, 0 deletionsMAINTAINERS
- drivers/bluetooth/btintel.c 80 additions, 49 deletionsdrivers/bluetooth/btintel.c
- drivers/bluetooth/btintel.h 19 additions, 0 deletionsdrivers/bluetooth/btintel.h
- drivers/bluetooth/btusb.c 41 additions, 97 deletionsdrivers/bluetooth/btusb.c
- drivers/bluetooth/hci_h5.c 4 additions, 8 deletionsdrivers/bluetooth/hci_h5.c
- drivers/bluetooth/hci_intel.c 14 additions, 38 deletionsdrivers/bluetooth/hci_intel.c
- drivers/bluetooth/hci_ldisc.c 1 addition, 7 deletionsdrivers/bluetooth/hci_ldisc.c
- drivers/net/ieee802154/Kconfig 11 additions, 0 deletionsdrivers/net/ieee802154/Kconfig
- drivers/net/ieee802154/Makefile 1 addition, 0 deletionsdrivers/net/ieee802154/Makefile
- drivers/net/ieee802154/adf7242.c 1285 additions, 0 deletionsdrivers/net/ieee802154/adf7242.c
- drivers/net/ieee802154/atusb.c 1 addition, 2 deletionsdrivers/net/ieee802154/atusb.c
- include/net/6lowpan.h 9 additions, 1 deletioninclude/net/6lowpan.h
- include/net/bluetooth/hci.h 0 additions, 1 deletioninclude/net/bluetooth/hci.h
- include/net/bluetooth/hci_core.h 13 additions, 5 deletionsinclude/net/bluetooth/hci_core.h
- include/net/ipv6.h 15 additions, 0 deletionsinclude/net/ipv6.h
- net/6lowpan/6lowpan_i.h 28 additions, 0 deletionsnet/6lowpan/6lowpan_i.h
- net/6lowpan/Kconfig 45 additions, 2 deletionsnet/6lowpan/Kconfig
- net/6lowpan/Makefile 9 additions, 0 deletionsnet/6lowpan/Makefile
- net/6lowpan/core.c 57 additions, 2 deletionsnet/6lowpan/core.c
Loading
Please register or sign in to comment