]> 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)
commit0b4012b28fefdbf367aa0641031c728f3861b634
tree1e15c5196541b928f076ae8d50e56a4cf9fbe7b8
parentbf4008dbf42d434d938743c1030a266ec0017213
parentfb737bbe4cc41fa2781062e03b95ba982fb60f64
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