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

Simple merge
Simple merge