Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 14 Jul 2015 06:55:32 +0000 (14:55 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 14 Jul 2015 06:55:32 +0000 (14:55 +0800)
Merge the crypto tree to pull in the nx reentrancy patch.


Trivial merge