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 2017-04-14 Here's the main batch of Bluetooth & 802.15.4 patches for the 4.12 kernel. - Many fixes to 6LoWPAN, in particular for BLE - New CA8210 IEEE 802.15.4 device driver (accounting for most of the lines of code added in this pull request) - Added Nokia Bluetooth (UART) HCI driver - Some serdev & TTY changes that are dependencies for the Nokia driver (with acks from relevant maintainers and an agreement that these come through the bluetooth tree) - Support for new Intel Bluetooth device - Various other minor cleanups/fixes here and there 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/ca8210.txt 28 additions, 0 deletionsDocumentation/devicetree/bindings/net/ieee802154/ca8210.txt
- Documentation/devicetree/bindings/net/nokia-bluetooth.txt 51 additions, 0 deletionsDocumentation/devicetree/bindings/net/nokia-bluetooth.txt
- Documentation/devicetree/bindings/net/ti,wilink-st.txt 35 additions, 0 deletionsDocumentation/devicetree/bindings/net/ti,wilink-st.txt
- Documentation/devicetree/bindings/vendor-prefixes.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/vendor-prefixes.txt
- MAINTAINERS 9 additions, 0 deletionsMAINTAINERS
- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts 5 additions, 0 deletionsarch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
- drivers/bluetooth/Kconfig 12 additions, 0 deletionsdrivers/bluetooth/Kconfig
- drivers/bluetooth/Makefile 3 additions, 0 deletionsdrivers/bluetooth/Makefile
- drivers/bluetooth/bluecard_cs.c 2 additions, 3 deletionsdrivers/bluetooth/bluecard_cs.c
- drivers/bluetooth/btmrvl_sdio.c 21 additions, 11 deletionsdrivers/bluetooth/btmrvl_sdio.c
- drivers/bluetooth/btrtl.c 8 additions, 5 deletionsdrivers/bluetooth/btrtl.c
- drivers/bluetooth/btusb.c 12 additions, 3 deletionsdrivers/bluetooth/btusb.c
- drivers/bluetooth/hci_bcm.c 39 additions, 20 deletionsdrivers/bluetooth/hci_bcm.c
- drivers/bluetooth/hci_h4.c 17 additions, 0 deletionsdrivers/bluetooth/hci_h4.c
- drivers/bluetooth/hci_intel.c 34 additions, 13 deletionsdrivers/bluetooth/hci_intel.c
- drivers/bluetooth/hci_ldisc.c 5 additions, 19 deletionsdrivers/bluetooth/hci_ldisc.c
- drivers/bluetooth/hci_ll.c 261 additions, 1 deletiondrivers/bluetooth/hci_ll.c
- drivers/bluetooth/hci_nokia.c 820 additions, 0 deletionsdrivers/bluetooth/hci_nokia.c
- drivers/bluetooth/hci_serdev.c 356 additions, 0 deletionsdrivers/bluetooth/hci_serdev.c
- drivers/bluetooth/hci_uart.h 7 additions, 1 deletiondrivers/bluetooth/hci_uart.h
Please register or sign in to comment