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

Merge the crypto tree to pull in vmx ghash fix.
This commit is contained in:
Herbert Xu
2016-10-10 11:19:47 +08:00
17 changed files with 158 additions and 197 deletions

View File

@@ -244,7 +244,7 @@ config HW_RANDOM_TX4939
config HW_RANDOM_MXC_RNGA
tristate "Freescale i.MX RNGA Random Number Generator"
depends on ARCH_HAS_RNGA
depends on SOC_IMX31
default HW_RANDOM
---help---
This driver provides kernel-side support for the Random Number