diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /crypto | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
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 6a2e295ee227..403857ad06d4 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -826,8 +826,8 @@ config CRYPTO_ANSI_CPRNG | |||
| 826 | help | 826 | help |
| 827 | This option enables the generic pseudo random number generator | 827 | This option enables the generic pseudo random number generator |
| 828 | for cryptographic modules. Uses the Algorithm specified in | 828 | for cryptographic modules. Uses the Algorithm specified in |
| 829 | ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS | 829 | ANSI X9.31 A.2.4. Note that this option must be enabled if |
| 830 | is selected | 830 | CRYPTO_FIPS is selected |
| 831 | 831 | ||
| 832 | source "drivers/crypto/Kconfig" | 832 | source "drivers/crypto/Kconfig" |
| 833 | 833 | ||