]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:25:07 +0000 (17:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:25:07 +0000 (17:25 +1100)
commit2874be00acabd389780cf4ffad268cda475e5273
treeadbc98dd33fe874dd5271c709f87ffa252341b24
parent49b21301f6393c64784d45b8eb9f17985887a9e9
parent42dceae2819b5ac6fc9a0d414ae05a8960e2a1d9
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/l2cap_sock.c