]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:09:39 +0000 (13:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:09:39 +0000 (13:09 +1100)
commitecf130d9a79555e3fcabbb509127bff019d71976
treeb3adf3f47203c4e7ef4ec42777e89ef53303fa9d
parent844479aac7bcbc689bb762145484e96119f10fbf
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