]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 02:49:01 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 02:49:01 +0000 (12:49 +1000)
1  2 
net/bluetooth/rfcomm/core.c

Simple merge