diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-28 12:25:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-28 12:25:04 +1000 |
| commit | 9d9c9d1ee3d4b54e426da32b6091766ebac0b870 (patch) | |
| tree | 8daa83294160d4f5015400694f387a2b369cfc21 /MAINTAINERS | |
| parent | 547842669ef4eab74029896d98c3824b1414de77 (diff) | |
| parent | aa32a796389bedbcf1c7714385b18714a0743810 (diff) | |
Merge remote branch 'ext3/for_next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ec4fd7233310..5370414ceaf1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2223,6 +2223,7 @@ S: Maintained F: drivers/net/eth16i.c EXT2 FILE SYSTEM +M: Jan Kara <jack@suse.cz> L: linux-ext4@vger.kernel.org S: Maintained F: Documentation/filesystems/ext2.txt @@ -2230,8 +2231,9 @@ F: fs/ext2/ F: include/linux/ext2* EXT3 FILE SYSTEM +M: Jan Kara <jack@suse.cz> M: Andrew Morton <akpm@linux-foundation.org> -M: Andreas Dilger <adilger@sun.com> +M: Andreas Dilger <adilger.kernel@dilger.ca> L: linux-ext4@vger.kernel.org S: Maintained F: Documentation/filesystems/ext3.txt @@ -2240,7 +2242,7 @@ F: include/linux/ext3* EXT4 FILE SYSTEM M: "Theodore Ts'o" <tytso@mit.edu> -M: Andreas Dilger <adilger@sun.com> +M: Andreas Dilger <adilger.kernel@dilger.ca> L: linux-ext4@vger.kernel.org W: http://ext4.wiki.kernel.org Q: http://patchwork.ozlabs.org/project/linux-ext4/list/ |