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 2016-05-07 Here are a few more Bluetooth patches for the 4.7 kernel: - NULL pointer fix in hci_intel driver - New Intel Bluetooth controller id in btusb driver - Added device tree binding documentation for Marvel's bt-sd8xxx - Platform specific wakeup interrupt support for btmrvl driver Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/btmrvl.txt 0 additions, 29 deletionsDocumentation/devicetree/bindings/btmrvl.txt
- Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt 56 additions, 0 deletionsDocumentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt
- drivers/bluetooth/btmrvl_drv.h 11 additions, 0 deletionsdrivers/bluetooth/btmrvl_drv.h
- drivers/bluetooth/btmrvl_main.c 20 additions, 15 deletionsdrivers/bluetooth/btmrvl_main.c
- drivers/bluetooth/btmrvl_sdio.c 79 additions, 0 deletionsdrivers/bluetooth/btmrvl_sdio.c
- drivers/bluetooth/btmrvl_sdio.h 6 additions, 0 deletionsdrivers/bluetooth/btmrvl_sdio.h
- drivers/bluetooth/btusb.c 6 additions, 5 deletionsdrivers/bluetooth/btusb.c
- drivers/bluetooth/hci_intel.c 2 additions, 4 deletionsdrivers/bluetooth/hci_intel.c
Please register or sign in to comment