Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[pandora-kernel.git] / MAINTAINERS
index cb5e818..73db93c 100644 (file)
@@ -4078,15 +4078,6 @@ F:       Documentation/filesystems/ext2.txt
 F:     fs/ext2/
 F:     include/linux/ext2*
 
-EXT3 FILE SYSTEM
-M:     Jan Kara <jack@suse.com>
-M:     Andrew Morton <akpm@linux-foundation.org>
-M:     Andreas Dilger <adilger.kernel@dilger.ca>
-L:     linux-ext4@vger.kernel.org
-S:     Maintained
-F:     Documentation/filesystems/ext3.txt
-F:     fs/ext3/
-
 EXT4 FILE SYSTEM
 M:     "Theodore Ts'o" <tytso@mit.edu>
 M:     Andreas Dilger <adilger.kernel@dilger.ca>
@@ -5787,16 +5778,9 @@ S:       Maintained
 F:     fs/jffs2/
 F:     include/uapi/linux/jffs2.h
 
-JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
-M:     Andrew Morton <akpm@linux-foundation.org>
-M:     Jan Kara <jack@suse.com>
-L:     linux-ext4@vger.kernel.org
-S:     Maintained
-F:     fs/jbd/
-F:     include/linux/jbd.h
-
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
 M:     "Theodore Ts'o" <tytso@mit.edu>
+M:     Jan Kara <jack@suse.com>
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 F:     fs/jbd2/