Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 446821b9fac9105bdd548e1c8846d92a63ccdb6f..9673cd28a69b3049f1c9f7b5b3eda9aa279404d1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2659,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
@@ -2929,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
@@ -3039,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
@@ -3921,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
@@ -4396,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