]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:25:37 +0000 (11:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:25:37 +0000 (11:25 +1000)
1  2 
net/bluetooth/hci_core.c

Simple merge