]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Feb 2016 20:44:52 +0000 (07:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Feb 2016 20:44:52 +0000 (07:44 +1100)

Trivial merge