]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 21 Sep 2018 05:22:37 +0000 (13:22 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 21 Sep 2018 05:22:37 +0000 (13:22 +0800)
commit910e3ca10bba726d10a865b279d98bf8fbf12cf4
treef4e35157bdb5f47ce7d31e99caa8dd3536ce4366
parent41a9aca6a2f359866552b06f19096d7fb77818dd
parent13cc6f48c7434ce46ba6dbc90003a136a263d75a
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.
drivers/crypto/caam/caamalg.c