Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mv-sheeva.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ea176e8edbdd74e021447b98b84f6c2ca419205f..4f6cdbf523eb7f10a7a673e132ea82f184c25ed6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -691,7 +691,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
        help
          Memory Resource Controller Swap Extension comes with its price in
          a bigger memory consumption. General purpose distribution kernels
-         which want to enable the feautre but keep it disabled by default
+         which want to enable the feature but keep it disabled by default
          and let the user enable it by swapaccount boot command line
          parameter should have this option unselected.
          For those who want to have the feature enabled by default should