diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 13:20:41 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 13:20:41 -0800 |
commit | cbda1b270f7ac23665f25fa513d2a73ea7149cbe (patch) | |
tree | df7d08c6dda69a8a664f8595109874e87f62129c /MAINTAINERS | |
parent | ca5b857cb0f42986520abd9dbb0c2508067342b2 (diff) | |
parent | 8d59598c35dc1071e6c36f86c9a95f26dd08b4e5 (diff) |
Merge branch 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull cramfs updates from Al Viro:
"Nicolas Pitre's cramfs work"
* 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
cramfs: rehabilitate it
cramfs: add mmap support
cramfs: implement uncompressed and arbitrary data block positioning
cramfs: direct memory access support
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e04d108055f0..ec3ec17c6c11 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3720,8 +3720,8 @@ F: drivers/cpuidle/* F: include/linux/cpuidle.h CRAMFS FILESYSTEM -W: http://sourceforge.net/projects/cramfs/ -S: Orphan / Obsolete +M: Nicolas Pitre <nico@linaro.org> +S: Maintained F: Documentation/filesystems/cramfs.txt F: fs/cramfs/ |