Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 908226600f16c8d2efd7c6efc384cc5a318d7bc7..9673cd28a69b3049f1c9f7b5b3eda9aa279404d1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1422,6 +1422,11 @@ P:       Doug Warzecha
 M:     Douglas_Warzecha@dell.com
 S:     Maintained
 
+DELL WMI EXTRAS DRIVER
+P:     Matthew Garrett
+M:     mjg59@srcf.ucam.org
+S:     Maintained
+
 DEVICE NUMBER REGISTRY
 P:     Torben Mathiasen
 M:     device@lanana.org
@@ -1763,6 +1768,12 @@ M:       viro@zeniv.linux.org.uk
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 
+FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
+P:     Riku Voipio
+M:     riku.vipio@iki.fi
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
 P:     Kristian Hoegsberg, Stefan Richter
 M:     krh@redhat.com, stefanr@s5r6.in-berlin.de
@@ -2648,6 +2659,12 @@ M:       jason.wessel@windriver.com
 L:     kgdb-bugreport@lists.sourceforge.net
 S:     Maintained
 
+KMEMTRACE
+P:     Eduard - Gabriel Munteanu
+M:     eduard.munteanu@linux360.ro
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 KPROBES
 P:     Ananth N Mavinakayanahalli
 M:     ananth@in.ibm.com
@@ -2918,6 +2935,12 @@ M:       buytenh@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 
+MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
+P:     Nicolas Pitre
+M:     nico@cam.org
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:     Mirko Lindner
 M:     mlindner@syskonnect.de
@@ -3028,8 +3051,9 @@ S:        Maintained
 
 MULTIFUNCTION DEVICES (MFD)
 P:     Samuel Ortiz
-M:     sameo@openedhand.com
+M:     sameo@linux.intel.com
 L:     linux-kernel@vger.kernel.org
+T:     git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
 S:     Supported
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
@@ -3408,6 +3432,11 @@ P:       Jim Cromie
 M:     jim.cromie@gmail.com
 S:     Maintained
 
+PCA9532 LED DRIVER
+P:     Riku Voipio
+M:     riku.voipio@iki.fi
+S:     Maintained
+
 PCI ERROR RECOVERY
 P:     Linas Vepstas
 M:     linas@austin.ibm.com
@@ -3905,7 +3934,14 @@ S:       Maintained
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 P:     Pierre Ossman
 M:     drzeus-sdhci@drzeus.cx
-L:     sdhci-devel@list.drzeus.cx
+L:     sdhci-devel@lists.ossman.eu
+S:     Maintained
+
+SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
+P:     Anton Vorontsov
+M:     avorontsov@ru.mvista.com
+L:     linuxppc-dev@ozlabs.org
+L:     sdhci-devel@lists.ossman.eu
 S:     Maintained
 
 SECURITY SUBSYSTEM
@@ -4371,10 +4407,7 @@ T:       quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches
 S:     Maintained
 
 TOSHIBA ACPI EXTRAS DRIVER
-P:     John Belmonte
-M:     toshiba_acpi@memebeam.org
-W:     http://memebeam.org/toys/ToshibaAcpiDriver
-S:     Maintained
+S:     Orphan
 
 TOSHIBA SMM DRIVER
 P:     Jonathan Buzzard
@@ -4383,6 +4416,11 @@ L:       tlinux-users@tce.toshiba-dme.co.jp
 W:     http://www.buzzard.org.uk/toshiba/
 S:     Maintained
 
+TMIO MMC DRIVER
+P:     Ian Molton
+M:     ian@mnementh.co.uk
+S:     Maintained
+
 TPM DEVICE DRIVER
 P:     Debora Velarde
 M:     debora@linux.vnet.ibm.com
@@ -4847,7 +4885,7 @@ M:        lrg@slimlogic.co.uk
 P:     Mark Brown
 M:     broonie@opensource.wolfsonmicro.com
 W:     http://opensource.wolfsonmicro.com/node/15
-W:     http://www.slimlogic.co.uk/?page_id=5
+W:     http://www.slimlogic.co.uk/?p=48
 T:     git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 S:     Supported