diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-09-05 10:11:43 +0200 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-09-05 10:11:43 +0200 |
commit | ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c (patch) | |
tree | 0bccb1282f603164f7ca22ace2c3c5f49d470391 /COPYING | |
parent | crypto: mcryptd - Fix typos in CRYPTO_MCRYPTD description (diff) | |
parent | crypto: drbg - remove check for uninitialized DRBG handle (diff) | |
download | linux-ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c.tar.xz linux-ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c.zip |
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.
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions