]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Mar 2015 19:47:12 +0000 (14:47 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Mar 2015 19:47:12 +0000 (14:47 -0500)
commit868b6ad1d2d36a09a85f0ebbd29b887ec4be8d98
treef76867215487fd7626acae395b412056eb8fde74
parent55d4d3fdab2bc104ee952b6a9841f1a1e728e1e9
parent85ff3bce23c72c396319664e8abd2a468fce3cf5
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-03-02

Here's the first bluetooth-next pull request targeting the 4.1 kernel:

 - ieee802154/6lowpan cleanups
 - SCO routing to host interface support for the btmrvl driver
 - AMP code cleanups
 - Fixes to AMP HCI init sequence
 - Refactoring of the HCI callback mechanism
 - Added shutdown routine for Intel controllers in the btusb driver
 - New config option to enable/disable Bluetooth debugfs information
 - Fix for early data reception on L2CAP fixed channels

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/sco.c