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/sctp/socket.c | |
| 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/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 9f1a908776de..83a76ba9d7b3 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -2586,7 +2586,7 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, int opt | |||
| 2586 | * | 2586 | * |
| 2587 | * 7.1.2 SCTP_ASSOCINFO | 2587 | * 7.1.2 SCTP_ASSOCINFO |
| 2588 | * | 2588 | * |
| 2589 | * This option is used to tune the the maximum retransmission attempts | 2589 | * This option is used to tune the maximum retransmission attempts |
| 2590 | * of the association. | 2590 | * of the association. |
| 2591 | * Returns an error if the new association retransmission value is | 2591 | * Returns an error if the new association retransmission value is |
| 2592 | * greater than the sum of the retransmission value of the peer. | 2592 | * greater than the sum of the retransmission value of the peer. |
| @@ -4547,7 +4547,7 @@ static int sctp_getsockopt_rtoinfo(struct sock *sk, int len, | |||
| 4547 | * | 4547 | * |
| 4548 | * 7.1.2 SCTP_ASSOCINFO | 4548 | * 7.1.2 SCTP_ASSOCINFO |
| 4549 | * | 4549 | * |
| 4550 | * This option is used to tune the the maximum retransmission attempts | 4550 | * This option is used to tune the maximum retransmission attempts |
| 4551 | * of the association. | 4551 | * of the association. |
| 4552 | * Returns an error if the new association retransmission value is | 4552 | * Returns an error if the new association retransmission value is |
| 4553 | * greater than the sum of the retransmission value of the peer. | 4553 | * greater than the sum of the retransmission value of the peer. |