diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
commit | d92ae4e2d77a00c7cd40b8d7055e7f017457c2e0 (patch) | |
tree | 33035b6a2698af192074ed1918f01d97dd79722e /crypto/algapi.c | |
parent | 9a79dc3dbfe617e6e02964eba0b009bf5ebd6610 (diff) | |
parent | 0eec8189c0b23c5d2b7ad9c11d955b4fc8bd74e0 (diff) | |
download | linux-crypto-d92ae4e2d77a00c7cd40b8d7055e7f017457c2e0.tar.gz linux-crypto-d92ae4e2d77a00c7cd40b8d7055e7f017457c2e0.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions