diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 18:02:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 18:02:57 -0400 |
commit | 9c1be0c4712fe760d8969427ef91107e9c062d91 (patch) | |
tree | 01210aba49c120116bb99ba031ff86a525ffb63d /MAINTAINERS | |
parent | 42fdd144a40f3afaccaa7ea538268bad3596439e (diff) | |
parent | 0d7eff873caaeac84de01a1acdca983d2c7ba3fe (diff) |
Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: include to compilation
UBIFS: add new flash file system
UBIFS: add brief documentation
MAINTAINERS: add UBIFS section
do_mounts: allow UBI root device name
VFS: export sync_sb_inodes
VFS: move inode_lock into sync_sb_inodes
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 633bda666e45..2e535e8de44b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2336,6 +2336,16 @@ L: linux-mtd@lists.infradead.org | |||
2336 | W: http://www.linux-mtd.infradead.org/doc/jffs2.html | 2336 | W: http://www.linux-mtd.infradead.org/doc/jffs2.html |
2337 | S: Maintained | 2337 | S: Maintained |
2338 | 2338 | ||
2339 | UBI FILE SYSTEM (UBIFS) | ||
2340 | P: Artem Bityutskiy | ||
2341 | M: dedekind@infradead.org | ||
2342 | P: Adrian Hunter | ||
2343 | M: ext-adrian.hunter@nokia.com | ||
2344 | L: linux-mtd@lists.infradead.org | ||
2345 | T: git git://git.infradead.org/~dedekind/ubifs-2.6.git | ||
2346 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html | ||
2347 | S: Maintained | ||
2348 | |||
2339 | JFS FILESYSTEM | 2349 | JFS FILESYSTEM |
2340 | P: Dave Kleikamp | 2350 | P: Dave Kleikamp |
2341 | M: shaggy@austin.ibm.com | 2351 | M: shaggy@austin.ibm.com |