]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 02:00:13 +0000 (12:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 02:00:13 +0000 (12:00 +1000)
1  2 
drivers/bluetooth/btusb.c
net/bluetooth/hci_event.c

Simple merge
Simple merge