diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-19 17:51:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 17:51:37 -0500 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /net/ipv4/Kconfig | |
| parent | f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (diff) | |
| parent | a5db219f4cf9f67995eabd53b81a1232c82f5852 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index dcb2e18f6f8e..8949a05ac307 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -435,7 +435,9 @@ config INET_DIAG | |||
| 435 | ---help--- | 435 | ---help--- |
| 436 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by | 436 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by |
| 437 | native Linux tools such as ss. ss is included in iproute2, currently | 437 | native Linux tools such as ss. ss is included in iproute2, currently |
| 438 | downloadable at <http://linux-net.osdl.org/index.php/Iproute2>. | 438 | downloadable at: |
| 439 | |||
| 440 | http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 | ||
| 439 | 441 | ||
| 440 | If unsure, say Y. | 442 | If unsure, say Y. |
| 441 | 443 | ||