]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:07:25 +0000 (13:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:07:25 +0000 (13:07 +1100)
commit6343d2a588e96117a1a4be108e112bc7c32af293
tree1c394bec3b4cd9a9e5c0b61477b5b7734339f24b
parent9229d517fa51f17f20749969d01983a1189c08ac
parent8920047889584998d9e13bcbbc6300bb4f5a8484
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c