Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 17 Oct 2018 06:14:06 +0000 (14:14 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 17 Oct 2018 06:14:06 +0000 (14:14 +0800)
commit58c8a863550b19ab3559dd5f5e27cc698c03e53b
treea9df76b4b06e65edc07bd2f7add99451bf929d69
parentce4e45842de3eb54b8dd6e081765d741f5b92b56
parentba439a6cbfa2936a6713f64cb499de7943673fe3
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge crypto tree to pick up chelsio bug fix.
drivers/crypto/chelsio/chcr_algo.c
drivers/crypto/chelsio/chcr_crypto.h
drivers/crypto/mxs-dcp.c