Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Dec 2013 18:46:08 +0000 (13:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Dec 2013 18:46:08 +0000 (13:46 -0500)
commitb7e047358449f8eb5cba8197b42280b676b82e54
tree88174a5fa109cb71eee4dd6413e35c7412095769
parent73f0b56a1ff64e7fb6c3a62088804bab93bcedc2
parent1bc5ad168f441f6f8bfd944288a5f7b4963ac1f6
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth
net/bluetooth/hci_sock.c