Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 17:03:47 +0000 (13:03 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 17:03:47 +0000 (13:03 -0400)
commita5eb1aeb25df89c627248a162cc35ffb556dc486
tree934fd6b18f17f72d5e57708b8e3a12b0071f1327
parent737be10d8cb783d1cadb1868b061abb2b4314eae
parentd7b2545023ecfde94d3ea9c03c5480ac18da96c9
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next

Conflicts:
drivers/bluetooth/btusb.c
drivers/bluetooth/btusb.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c
net/bluetooth/rfcomm/core.c