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/sched/Kconfig | |
| parent | f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (diff) | |
| parent | a5db219f4cf9f67995eabd53b81a1232c82f5852 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'net/sched/Kconfig')
| -rw-r--r-- | net/sched/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 4b753ef70bb..20405530299 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -24,7 +24,7 @@ menuconfig NET_SCHED | |||
| 24 | To administer these schedulers, you'll need the user-level utilities | 24 | To administer these schedulers, you'll need the user-level utilities |
| 25 | from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. | 25 | from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. |
| 26 | That package also contains some documentation; for more, check out | 26 | That package also contains some documentation; for more, check out |
| 27 | <http://linux-net.osdl.org/index.php/Iproute2>. | 27 | <http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>. |
| 28 | 28 | ||
| 29 | This Quality of Service (QoS) support will enable you to use | 29 | This Quality of Service (QoS) support will enable you to use |
| 30 | Differentiated Services (diffserv) and Resource Reservation Protocol | 30 | Differentiated Services (diffserv) and Resource Reservation Protocol |