summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-15 13:31:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-15 13:31:00 -0700
commitc7823b6b97ddc3d9f627611557d2b5842c36b67e (patch)
tree12e2328e64f37847c35ab3552f795413f1ebd0e5 /fs
parent176bed1de5bf977938cad26551969eca8f0883b1 (diff)
parentd4eb6dee471250661a5183a7336b18c85990e26d (diff)
downloadlinux-c7823b6b97ddc3d9f627611557d2b5842c36b67e.tar.gz
linux-c7823b6b97ddc3d9f627611557d2b5842c36b67e.tar.xz
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext4 Kconfig description fixup from Jan Kara: "A small fixup in description of EXT4_USE_FOR_EXT2 config option" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext4: Update EXT4_USE_FOR_EXT2 description
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index 47728da7702c..b46e9fc64196 100644
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -63,7 +63,7 @@ config EXT4_FS
If unsure, say N.
config EXT4_USE_FOR_EXT2
- bool "Use ext4 for ext2/ext3 file systems"
+ bool "Use ext4 for ext2 file systems"
depends on EXT4_FS
depends on EXT2_FS=n
default y