Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
Merge crypto tree to pick up vmx changes.

1  2 
crypto/jitterentropy-kcapi.c
drivers/crypto/caam/ctrl.c

Simple merge
Simple merge