Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 5 Sep 2014 08:11:43 +0000 (16:11 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 5 Sep 2014 08:11:43 +0000 (16:11 +0800)
commitea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c
tree0bccb1282f603164f7ca22ace2c3c5f49d470391
parent0e56673b7bb4e66c15a5a2ca2d9ecabf9d74c2af
parent78f543a93473f67a1035949a293b79288e259b6e
Merge git://git./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.
crypto/drbg.c