Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

This commit is contained in:
Linus Torvalds
2006-01-15 16:43:29 -08:00
41 changed files with 306 additions and 334 deletions

View File

@@ -2676,10 +2676,6 @@ config SHAPER
Class-Based Queueing (CBQ) scheduling support which you get if you
say Y to "QoS and/or fair queueing" above.
To set up and configure shaper devices, you need the shapecfg
program, available from <ftp://shadow.cabi.net/pub/Linux/> in the
shaper package.
To compile this driver as a module, choose M here: the module
will be called shaper. If unsure, say N.