1 files changed, 19 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 36aadf6003b9..f50e927a1189 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -486,6 +486,12 @@ M:	kernel@wantstofly.org
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+ARM/GUMSTIX MACHINE SUPPORT
+P:      Steve Sakoman
+M:      sakoman@gmail.com
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 P:      Kristoffer Ericson
 M:      kristoffer.ericson@gmail.com
@@ -678,6 +684,11 @@ L:	linux-wireless@vger.kernel.org
 L:      ath5k-devel@lists.ath5k.org
 S:      Maintained
 
+ATI_REMOTE2 DRIVER
+P:      Ville Syrjala
+M:      syrjala@sci.fi
+S:      Maintained
+
 ATL1 ETHERNET DRIVER
 P:      Jay Cliburn
 M:      jcliburn@gmail.com
@@ -2939,7 +2950,7 @@ P:	Mark Fasheh
 M:      mfasheh@suse.com
 P:      Joel Becker
 M:      joel.becker@oracle.com
-L:      ocfs2-devel@oss.oracle.com
+L:      ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:      http://oss.oracle.com/projects/ocfs2/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 S:      Supported
@@ -3057,11 +3068,10 @@ L:	linux-pci@atrey.karlin.mff.cuni.cz
 S:      Supported
 
 PCI SUBSYSTEM
-P:      Greg Kroah-Hartman
-M:      gregkh@suse.de
+P:      Jesse Barnes
+M:      jbarnes@virtuousgeek.org
 L:      linux-kernel@vger.kernel.org
 L:      linux-pci@atrey.karlin.mff.cuni.cz
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:      Supported
 
 PCI HOTPLUG CORE
@@ -3602,6 +3612,11 @@ M:	mhoffman@lightlink.com
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+SMX UIO Interface
+P:      Ben Nizette
+M:      bn@niasdigital.com
+S:      Maintained
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:      Ingo Molnar
 M:      mingo@redhat.com