]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:00:46 +0000 (12:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:00:46 +0000 (12:00 +1000)
1  2 
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c

Simple merge
Simple merge