| commit | 910e3ca10bba726d10a865b279d98bf8fbf12cf4 | [log] [tgz] |
|---|---|---|
| author | Herbert Xu <herbert@gondor.apana.org.au> | Fri Sep 21 13:22:37 2018 +0800 |
| committer | Herbert Xu <herbert@gondor.apana.org.au> | Fri Sep 21 13:22:37 2018 +0800 |
| tree | f4e35157bdb5f47ce7d31e99caa8dd3536ce4366 | |
| parent | 41a9aca6a2f359866552b06f19096d7fb77818dd [diff] | |
| parent | 13cc6f48c7434ce46ba6dbc90003a136a263d75a [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Merge crypto-2.6 to resolve caam conflict with skcipher conversion.