]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:49:57 +0000 (11:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:49:57 +0000 (11:49 +1100)
commit1302ad38868b4ff9cbfb546b312848313b35a5b2
tree742e0cc7fc014f1f34945aa29cd77a6994907141
parent4ef2cf2075dbed14c40e18ee72576584a6ec92df
parent5a13b09531420d230616bd524b68a5b0c23cd487
Merge remote-tracking branch 'bluetooth/master'
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