Merge branch 'master' of /repos/git/net-next-2.6

This commit is contained in:
Patrick McHardy
2011-01-19 23:51:37 +01:00
4195 changed files with 257657 additions and 108862 deletions

View File

@@ -435,7 +435,9 @@ config INET_DIAG
---help---
Support for INET (TCP, DCCP, etc) socket monitoring interface used by
native Linux tools such as ss. ss is included in iproute2, currently
downloadable at <http://linux-net.osdl.org/index.php/Iproute2>.
downloadable at:
http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
If unsure, say Y.