Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 Aug 2013 18:27:31 +0000 (14:27 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 Aug 2013 18:27:31 +0000 (14:27 -0400)
commit69b307a48a5e10d5fd53dbbfae1c700da356bd5d
tree0a09cc42b3a592d19e5229a84c93f2b58f8c89d3
parent24de851b79a414f0e1813eb131a7d90849cc22c2
parent2dea632f9acad076370fe871d4ccc93868621403
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next
net/bluetooth/hci_core.c