diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 01:43:29 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 01:43:29 +0100 |
commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
tree | baec074db38a5ceaaabbcee76f199acef43bb42a /init | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | MAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org list (diff) | |
download | linux-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.tar.xz linux-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 25f4d74adf7e..7efa729d2cf4 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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. |