]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 01:14:22 +0000 (11:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 01:14:22 +0000 (11:14 +1000)
1  2 
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c

Simple merge
Simple merge