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

Simple merge