Merge branch 'linus' into idle-test

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bb6c1ac85138878ddfe3a3cecbbf1874af0b8638..64d7621ab35be81e335fa24582fb888715e097c5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1785,7 +1785,8 @@ S:        Maintained
 F:     drivers/usb/atm/cxacru.c
 
 CONFIGFS
-M:     Joel Becker <[email protected]>
+M:     Joel Becker <[email protected]>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git
 S:     Supported
 F:     fs/configfs/
 F:     include/linux/configfs.h
@@ -4382,11 +4383,11 @@ F:      Documentation/scsi/NinjaSCSI.txt
 F:     drivers/scsi/nsp32*
 
 NTFS FILESYSTEM
-M:     Anton Altaparmakov <a[email protected]>
+M:     Anton Altaparmakov <a[email protected]>
 L:     [email protected]
-W:     http://www.linux-ntfs.org/
+W:     http://www.tuxera.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
-S:     Maintained
+S:     Supported
 F:     Documentation/filesystems/ntfs.txt
 F:     fs/ntfs/
 
@@ -4549,7 +4550,7 @@ F:        include/linux/oprofile.h
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M:     Mark Fasheh <[email protected]>
-M:     Joel Becker <j[email protected]>
+M:     Joel Becker <j[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 W:     http://oss.oracle.com/projects/ocfs2/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git