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
commit 3f02d072d4
41 changed files with 306 additions and 334 deletions

View file

@ -99,7 +99,7 @@ config SWAP
default y
help
This option allows you to choose whether you want to have support
for socalled swap devices or swap files in your kernel that are
for so called swap devices or swap files in your kernel that are
used to provide more virtual memory than the actual RAM present
in your computer. If unsure say Y.