]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 02:36:15 +0000 (13:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 02:36:15 +0000 (13:36 +1100)
commit08590cdecc3a9524312d65a71c4e15a75beda35d
treefcd20b5cbe3540f5ec7f1bbd877bed179a692971
parentc337d3fad4847a87273075539b0cc8e354b5e6ba
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