]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 00:54:42 +0000 (11:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 00:54:42 +0000 (11:54 +1100)
1  2 
net/bluetooth/sco.c

Simple merge