]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 00:36:53 +0000 (11:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 00:36:53 +0000 (11:36 +1100)
1  2 
net/ipv6/addrconf.c

Simple merge