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)
commit773bb50625cd23c7711bcd1410fffe8a0cab121b
tree5153fb0cfa8c29666ef3f997b95378dbf55983fc
parent1425d2d17f7309c65e2bd124e0ce8ace743b17f2
parent030f4e968741d65aea9cd5f7814d1164967801ef
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in the nx reentrancy patch.