]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Nov 2012 02:18:56 +0000 (13:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Nov 2012 02:18:56 +0000 (13:18 +1100)
1  2 
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c

Simple merge
Simple merge