Merge current mainline tree into linux-omap tree

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 0899c083bdfb53ce1487a4a04512d4bb7a305420..11800c33ea84760575944dbca4e5fd3458ff3086 100644 (file)
--- 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
@@ -3064,11 +3070,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
@@ -3609,6 +3614,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
@@ -3851,7 +3861,7 @@ S:      Maintained
 
 TI OMAP MMC INTERFACE DRIVER
 P:     Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:     linux-omap-open-source@linux.omap.com (subscribers only)
+M:     linux-omap@vger.kernel.org
 W:     http://linux.omap.com
 W:     http://www.muru.com/linux/omap/
 S:     Maintained