tree 0bccb1282f603164f7ca22ace2c3c5f49d470391
parent 0e56673b7bb4e66c15a5a2ca2d9ecabf9d74c2af
parent 78f543a93473f67a1035949a293b79288e259b6e
author Herbert Xu <herbert@gondor.apana.org.au> 1409904703 +0800
committer Herbert Xu <herbert@gondor.apana.org.au> 1409904703 +0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merging the crypto tree for 3.17 in order to resolve the conflict
on the 32-bit DRBG overflow fix.