aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/nilfs2.txt
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-08-05 15:25:56 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-08-05 15:25:56 -0400
commit13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2 (patch)
tree6a81d50b611170ca6dd1ed9cce2b86dd19f190d8 /Documentation/filesystems/nilfs2.txt
parent17edf2d79f1ea6dfdb4c444801d928953b9f98d6 (diff)
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff)
Merge commit 'v3.0' into x86/cpu
Diffstat (limited to 'Documentation/filesystems/nilfs2.txt')
-rw-r--r--Documentation/filesystems/nilfs2.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index d5c0cef38a71..873a2ab2e9f8 100644
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -40,7 +40,6 @@ Features which NILFS2 does not support yet:
40 - POSIX ACLs 40 - POSIX ACLs
41 - quotas 41 - quotas
42 - fsck 42 - fsck
43 - resize
44 - defragmentation 43 - defragmentation
45 44
46Mount options 45Mount options