diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
| commit | 9a9136e270af14da506f66bcafcc506b86a86498 (patch) | |
| tree | b4d0a6877d92635134b7a944d0032fbc43227fd2 /net/ipv4/Kconfig | |
| parent | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff) | |
| parent | 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
sound: convert "sound" subdirectory to UTF-8
MAINTAINERS: Add cxacru website/mailing list
include files: convert "include" subdirectory to UTF-8
general: convert "kernel" subdirectory to UTF-8
documentation: convert the Documentation directory to UTF-8
Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
remove broken URLs from net drivers' output
Magic number prefix consistency change to Documentation/magic-number.txt
trivial: s/i_sem /i_mutex/
fix file specification in comments
drivers/base/platform.c: fix small typo in doc
misc doc and kconfig typos
Remove obsolete fat_cvf help text
Fix occurrences of "the the "
Fix minor typoes in kernel/module.c
Kconfig: Remove reference to external mqueue library
Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
Correct comments in genrtc.c to refer to correct /proc file.
Fix more "deprecated" spellos.
Fix "deprecated" typoes.
...
Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index e62aee0ec4c5..c68196cc56ab 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -130,7 +130,7 @@ config IP_ROUTE_MULTIPATH_RR | |||
| 130 | tristate "MULTIPATH: round robin algorithm" | 130 | tristate "MULTIPATH: round robin algorithm" |
| 131 | depends on IP_ROUTE_MULTIPATH_CACHED | 131 | depends on IP_ROUTE_MULTIPATH_CACHED |
| 132 | help | 132 | help |
| 133 | Mulitpath routes are chosen according to Round Robin | 133 | Multipath routes are chosen according to Round Robin |
| 134 | 134 | ||
| 135 | config IP_ROUTE_MULTIPATH_RANDOM | 135 | config IP_ROUTE_MULTIPATH_RANDOM |
| 136 | tristate "MULTIPATH: random algorithm" | 136 | tristate "MULTIPATH: random algorithm" |
| @@ -651,7 +651,7 @@ config TCP_MD5SIG | |||
| 651 | select CRYPTO | 651 | select CRYPTO |
| 652 | select CRYPTO_MD5 | 652 | select CRYPTO_MD5 |
| 653 | ---help--- | 653 | ---help--- |
| 654 | RFC2385 specifices a method of giving MD5 protection to TCP sessions. | 654 | RFC2385 specifies a method of giving MD5 protection to TCP sessions. |
| 655 | Its main (only?) use is to protect BGP sessions between core routers | 655 | Its main (only?) use is to protect BGP sessions between core routers |
| 656 | on the Internet. | 656 | on the Internet. |
| 657 | 657 | ||