summaryrefslogtreecommitdiffstats
path: root/crypto/twofish_common.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-09-05 16:11:43 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2014-09-05 16:11:43 +0800
commitea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c (patch)
tree0bccb1282f603164f7ca22ace2c3c5f49d470391 /crypto/twofish_common.c
parent0e56673b7bb4e66c15a5a2ca2d9ecabf9d74c2af (diff)
parent78f543a93473f67a1035949a293b79288e259b6e (diff)
downloadlinux-ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c.tar.bz2
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 'crypto/twofish_common.c')
0 files changed, 0 insertions, 0 deletions