]> 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)
commit4a66b673e9b26e11a5220ad987a92dd673c47dea
tree934fd6b18f17f72d5e57708b8e3a12b0071f1327
parent47583d10575e110e4c6293790b1ebf7d3f9f6681
parent07088f44d3aa031c81f540e4c445f13a1d7a0def
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