]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 04:56:55 +0000 (15:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 04:56:55 +0000 (15:56 +1100)
1  2 
drivers/bluetooth/btusb.c
net/ipv6/addrconf.c

Simple merge
Simple merge