diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 02:39:29 +0100 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 02:39:29 +0100 |
commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
tree | c08504e4d2fa51ac91cef544f336d0169806c49f /fs/overlayfs/Kconfig | |
parent | Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | copy_from_iter_nocache() (diff) | |
download | linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'fs/overlayfs/Kconfig')
-rw-r--r-- | fs/overlayfs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/overlayfs/Kconfig b/fs/overlayfs/Kconfig index e60125976873..34355818a2e0 100644 --- a/fs/overlayfs/Kconfig +++ b/fs/overlayfs/Kconfig @@ -1,4 +1,4 @@ -config OVERLAYFS_FS +config OVERLAY_FS tristate "Overlay filesystem support" help An overlay filesystem combines two filesystems - an 'upper' filesystem |