Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 21:02:05 +0000 (16:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 21:02:05 +0000 (16:02 -0500)
commit5f779bbd472cdb2046ff8b672ad8c5b62b61cd19
tree151dc07e9a69dd48e38251ba88811490ca16969a
parentd7a4858c0fde8383f7aa494eda0fba6bef3f2fec
parent5a13b09531420d230616bd524b68a5b0c23cd487
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next
drivers/bluetooth/btmrvl_sdio.c
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c