Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

author Herbert Xu <[email protected]>

Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)

committer Herbert Xu <[email protected]>

Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
author Herbert Xu <[email protected]>
Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
committer Herbert Xu <[email protected]>
Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
diff --cc crypto/jitterentropy-kcapi.c
Simple merge
diff --cc drivers/crypto/caam/ctrl.c
Simple merge
author	Herbert Xu <[email protected]>
	Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
committer	Herbert Xu <[email protected]>
	Thu, 20 Jun 2019 06:17:24 +0000 (14:17 +0800)
		1	2
crypto/jitterentropy-kcapi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/caam/ctrl.c	patch \|	diff1 \|	diff2 \|	blob \| history