]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 01:41:43 +0000 (11:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 01:41:43 +0000 (11:41 +1000)
commita52590dcd26b60a7d077e80815b372c2f1f0fc0d
tree9e4e7cfc1bb0fe1b10c555b25bd869bb5a5237a1
parentdb659fadc94deae874da2cae794ee4eb7dbc2ab7
parent6fd7571c30976b77e125530ff0465f120e7c85ae
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_conn.c
net/bluetooth/smp.c