diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /net/ipv4/Kconfig | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.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 e848e6c062c..9e95d7fb6d5 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -84,7 +84,7 @@ config IP_FIB_TRIE | |||
| 84 | 84 | ||
| 85 | An experimental study of compression methods for dynamic tries | 85 | An experimental study of compression methods for dynamic tries |
| 86 | Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. | 86 | Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. |
| 87 | http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/ | 87 | <http://www.csc.kth.se/~snilsson/software/dyntrie2/> |
| 88 | 88 | ||
| 89 | endchoice | 89 | endchoice |
| 90 | 90 | ||
| @@ -562,7 +562,7 @@ config TCP_CONG_VENO | |||
| 562 | distinguishing to circumvent the difficult judgment of the packet loss | 562 | distinguishing to circumvent the difficult judgment of the packet loss |
| 563 | type. TCP Veno cuts down less congestion window in response to random | 563 | type. TCP Veno cuts down less congestion window in response to random |
| 564 | loss packets. | 564 | loss packets. |
| 565 | See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf | 565 | See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186> |
| 566 | 566 | ||
| 567 | config TCP_CONG_YEAH | 567 | config TCP_CONG_YEAH |
| 568 | tristate "YeAH TCP" | 568 | tristate "YeAH TCP" |