Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Sep 2013 17:09:17 +0000 (13:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Sep 2013 17:11:17 +0000 (13:11 -0400)
commit0a878747e18d4d14c5b772dcddddd86bb4c26f8f
treeb214678a35945e2c84a82192df79472923fdbcba
parentf875691640cd3fa67f7ad1d3130ff9fa7fdca042
parentc7515d2365a6b8a018950198ebe1f5be793cd4bb
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem

Also fixed-up a badly indented closing brace...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/bluetooth/hci_core.c