Merge branch 'linus' into x86/signal

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 85be56a6efbfe5f8fafb6a499cafbb3562ac2554..587f418ed00d46eceb92cf6251e3c49d1d87c029 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -387,6 +387,7 @@ AMD IOMMU (AMD-VI)
 P:     Joerg Roedel
 M:     joerg.roedel@amd.com
 L:     iommu@lists.linux-foundation.org
+T:     git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:     Supported
 
 AMS (Apple Motion Sensor) DRIVER
@@ -1658,9 +1659,10 @@ L:       linux-ext4@vger.kernel.org
 S:     Maintained
 
 EXT4 FILE SYSTEM
-P:     Stephen Tweedie, Andrew Morton
-M:     sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
+P:     Theodore Ts'o
+M:     tytso@mit.edu, adilger@sun.com
 L:     linux-ext4@vger.kernel.org
+W:     http://ext4.wiki.kernel.org
 S:     Maintained
 
 F71805F HARDWARE MONITORING DRIVER