Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Nov 2013 14:03:10 +0000 (09:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Nov 2013 14:03:10 +0000 (09:03 -0500)
commitc1f3bb6bd317994beb3af7bbec4bf54ed0035509
tree878833c714ddcb35f1574f2b11e1f69d1130d206
parentdcd607718385d02ce3741de225927a57f528f93b
parent3c57e865cfb2dcbb48fdfa08e7d4e3479e9b40f0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h