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)
commitbdb275bb6486d19888cb669fedd7d3eea2031669
treea6d78624f1e8d7a797803636d1d92e6ae584949b
parentb0d765219fb3308638754e28f71377d3752f1266
parent7829a0c1cb9c80debfb4fdb49b4d90019f2ea1ac
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge crypto tree to pick up vmx changes.
crypto/jitterentropy-kcapi.c
drivers/crypto/caam/ctrl.c