Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2bd34ef58ffa75bb8eb8c642381a344ded56a629..1b1491d64ca6740910b71bc6b4bf195844ce05bf 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -207,16 +207,45 @@ S:        Supported
 ACPI
 P:     Len Brown
 M:     len.brown@intel.com
+M:     lenb@kernel.org
 L:     linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 T:     git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
-S:     Maintained
+S:     Supported
+
+ACPI BATTERY DRIVERS
+P:     Vladimir P. Lebedev
+M:     vladimir.p.lebedev@intel.com
+L:     linux-acpi@vger.kernel.org
+W:     http://acpi.sourceforge.net/
+S:     Supported
+
+ACPI EC DRIVER
+P:     Alexey Starikovskiy
+M:     alexey.y.starikovskiy@linux.intel.com
+L:     linux-acpi@vger.kernel.org
+W:     http://acpi.sourceforge.net/
+S:     Supported
+
+ACPI FAN DRIVER
+P:     Konstantin A. Karasyov
+M:     konstantin.a.karasyov@intel.com
+L:     linux-acpi@vger.kernel.org
+W:     http://acpi.sourceforge.net/
+S:     Supported
 
 ACPI PCI HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
 L:     pcihpd-discuss@lists.sourceforge.net
-S:     Maintained
+S:     Supported
+
+ACPI THERMAL DRIVER
+P:     Konstantin A. Karasyov
+M:     konstantin.a.karasyov@intel.com
+L:     linux-acpi@vger.kernel.org
+W:     http://acpi.sourceforge.net/
+S:     Supported
 
 AD1816 SOUND DRIVER
 P:     Thorsten Knabe
@@ -412,20 +441,32 @@ S:      Maintained
 ARM/INTEL IOP32X ARM ARCHITECTURE
 P:     Lennert Buytenhek
 M:     kernel@wantstofly.org
+P:     Dan Williams
+M:     dan.j.williams@intel.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-S:     Maintained
+S:     Supported
+
+ARM/INTEL IOP33X ARM ARCHITECTURE
+P:     Dan Williams
+M:     dan.j.williams@intel.com
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:     Supported
 
 ARM/INTEL IOP13XX ARM ARCHITECTURE
 P:     Lennert Buytenhek
 M:     kernel@wantstofly.org
+P:     Dan Williams
+M:     dan.j.williams@intel.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-S:     Maintained
+S:     Supported
 
 ARM/INTEL IQ81342EX MACHINE SUPPORT
 P:     Lennert Buytenhek
 M:     kernel@wantstofly.org
+P:     Dan Williams
+M:     dan.j.williams@intel.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-S:     Maintained
+S:     Supported
 
 ARM/INTEL IXP2000 ARM ARCHITECTURE
 P:     Lennert Buytenhek
@@ -448,8 +489,10 @@ S: Maintained
 ARM/INTEL XSC3 (MANZANO) ARM CORE
 P:     Lennert Buytenhek
 M:     kernel@wantstofly.org
+P:     Dan Williams
+M:     dan.j.williams@intel.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-S:     Maintained
+S:     Supported
 
 ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
 P:     Lennert Buytenhek
@@ -1071,7 +1114,7 @@ DOCKING STATION DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
 L:     linux-acpi@vger.kernel.org
-S:     Maintained
+S:     Supported
 
 DOUBLETALK DRIVER
 P:     James R. Van Zandt
@@ -2521,7 +2564,7 @@ PCIE HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
 L:     pcihpd-discuss@lists.sourceforge.net
-S:     Maintained
+S:     Supported
 
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
@@ -2622,6 +2665,12 @@ M:       promise@pnd-pc.demon.co.uk
 W:     http://www.pnd-pc.demon.co.uk/promise/
 S:     Maintained
 
+PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
+P:     Mikael Pettersson
+M:     mikpe@it.uu.se
+L:     linux-ide@vger.kernel.org
+S:     Maintained
+
 PS3 PLATFORM SUPPORT
 P:     Geoff Levand
 M:     geoffrey.levand@am.sony.com
@@ -3021,7 +3070,7 @@ SHPC HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
 L:     pcihpd-discuss@lists.sourceforge.net
-S:     Maintained
+S:     Supported
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER
 P:     Pierre Ossman