]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 31 Jul 2013 19:11:50 +0000 (15:11 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 31 Jul 2013 19:11:50 +0000 (15:11 -0400)
commita073b553c09e1348301edf5898c55210242a5a78
tree1e15c5196541b928f076ae8d50e56a4cf9fbe7b8
parent56bc6bcedf241dd9929a86acd3aaa0083d56e4ee
parentd75543775fbffa17c07f87aaeb7beff485744047
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Conflicts:
net/bluetooth/hci_core.c
drivers/bluetooth/btusb.c
net/bluetooth/hci_core.c