diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 12:57:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 12:57:07 -0700 |
| commit | 90e0c225968f0878e090c7ff3f88323973476cee (patch) | |
| tree | 30fff5a5cb18b08d40e4d496489be6ce714a6cde /MAINTAINERS | |
| parent | 938a73b959cf77aadc41bded3bf416b618aa20b3 (diff) | |
| parent | 5f11e6a44059f728dddd8d0dbe5b4368ea93575b (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
ext3: Fix dirtying of journalled buffers in data=journal mode
ext3: default to ordered mode
quota: Use mark_inode_dirty_sync instead of mark_inode_dirty
quota: Change quota error message to print out disk and function name
MAINTAINERS: Update entries of ext2 and ext3
MAINTAINERS: Update address of Andreas Dilger
ext3: Avoid filesystem corruption after a crash under heavy delete load
ext3: remove vestiges of nobh support
ext3: Fix set but unused variables
quota: clean up quota active checks
quota: Clean up the namespace in dqblk_xfs.h
quota: check quota reservation on remove_dquot_ref
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 100a3f535c9..1349d1cb5ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2237,6 +2237,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 @@ -2244,8 +2245,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 @@ -2254,7 +2256,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/ |