diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-15 14:03:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-15 14:03:49 -0400 |
| commit | af8a927c8bdea82cf220e0b720d64daaf073a969 (patch) | |
| tree | 97411751db099ab0c2022d0699e6f9df9aef2e3a | |
| parent | 3110df800c4de2724624d46e6bed27efc5e9a707 (diff) | |
| parent | 3a36199114de0e60984534776732e0a7a220e29e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: remove resize from unsupported features list
| -rw-r--r-- | Documentation/filesystems/nilfs2.txt | 1 |
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 | ||
| 46 | Mount options | 45 | Mount options |