]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:28:13 +0000 (13:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:28:13 +0000 (13:28 +1100)
commitd034ab249b3e62ad9ae28b5199e43c8049ec6b56
tree71c2568f619e08c349c8ebbec82b9e6dc017d33f
parentfbab38f41e8f0cf595446873fd2a8bbc79feb7a3
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