diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
| commit | c3c854666a1e0eab53468b523a5334b7b0999aed (patch) | |
| tree | 590d6092e998a8376e180d880a658814e0c0337f /crypto | |
| parent | 2f025d4565dbc47c29b515ed52d68bbfbfbfc17b (diff) | |
| parent | 02ae4fd2372ed8a24d19f5437d62daf7bccb262e (diff) | |
| download | linux-crypto-c3c854666a1e0eab53468b523a5334b7b0999aed.tar.gz linux-crypto-c3c854666a1e0eab53468b523a5334b7b0999aed.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 6a2e295e..403857ad 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -826,8 +826,8 @@ config CRYPTO_ANSI_CPRNG help This option enables the generic pseudo random number generator for cryptographic modules. Uses the Algorithm specified in - ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS - is selected + ANSI X9.31 A.2.4. Note that this option must be enabled if + CRYPTO_FIPS is selected source "drivers/crypto/Kconfig" |