summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-09-05 10:11:43 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2014-09-05 10:11:43 +0200
commitea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c (patch)
tree0bccb1282f603164f7ca22ace2c3c5f49d470391 /COPYING
parentcrypto: mcryptd - Fix typos in CRYPTO_MCRYPTD description (diff)
parentcrypto: drbg - remove check for uninitialized DRBG handle (diff)
downloadlinux-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