]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3dcde0ca3deade2d852743c7506036f055ebd366
tree934fd6b18f17f72d5e57708b8e3a12b0071f1327
parent8fd666cd1305f68af56aeb293c94ddc2bd4c6a01
parent08eccc8f17cac601c08942cbc9f1a8e849586efd
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/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