diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/filesystems/nilfs2.txt | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/filesystems/nilfs2.txt')
| -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 |