Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Sat, 14 Mar 2015 18:29:45 +0000 (14:29 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Mar 2015 18:29:45 +0000 (14:29 -0400)
commit5f1764ddfeb038decfe2b2fda030d0bed43fa36a
treea42d36330758ccce3becb22b96c8c748b89a837a
parent2801be4a0ea4cd0965f9c12ff813a91892a8e157
parentb6d595e3f74fe0dd9edc0d5bf30cd6e6fe29f023
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
Here's another set of Bluetooth & ieee802154 patches intended for 4.1:

 - Added support for QCA ROME chipset family in the btusb driver
 - at86rf230 driver fixes & cleanups
 - ieee802154 cleanups
 - Refactoring of Bluetooth mgmt API to allow new users
 - New setting for static Bluetooth address exposed to user space
 - Refactoring of hci_dev flags to remove limit of 32
 - Remove unnecessary fast-connectable setting usage restrictions
 - Fix behavior to be consistent when trying to pair already paired device
 - Service discovery corner-case fixes

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

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/bluetooth/btusb.c