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-04-09 We've had enough new patches during the past week (especially from Marcel) that it'd be good to still get these queued for 4.1. The majority of the changes are from Marcel with lots of cleanup & refactoring patches for the HCI UART driver. Marcel also split out some Broadcom & Intel vendor specific functionality into two new btintel & btbcm modules. In addition to the HCI driver changes there's the completion of our local OOB data interface for pairing, added support for requesting remote LE features when connecting, as well as a couple of minor fixes for mac802154. Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Showing
drivers/bluetooth/btbcm.c
0 → 100644
drivers/bluetooth/btbcm.h
0 → 100644
drivers/bluetooth/btintel.c
0 → 100644
drivers/bluetooth/btintel.h
0 → 100644
drivers/bluetooth/hci_bcm.c
0 → 100644
drivers/bluetooth/hci_intel.c
0 → 100644
想要评论请 注册 或 登录