]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 16 Feb 2012 04:18:21 +0000 (12:18 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 16 Feb 2012 04:18:21 +0000 (12:18 +0800)
Merge crypto tree as it has cherry-picked the ror64 patch from cryptodev.


Trivial merge