]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ipsec-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:17:40 +0000 (12:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:17:40 +0000 (12:17 +1100)

Trivial merge