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)
commit704278ccb5c9fcbe09d1be3657950c17fad18ba8
tree1e15c5196541b928f076ae8d50e56a4cf9fbe7b8
parentd6158a55738863b3fe2d48bbb3bf33005ef834b8
parent53e21fbc288218a423959f878c86471a0e323a9a
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth

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