Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ec5c8ee..2b9212f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,8 +216,8 @@ W:  http://code.google.com/p/aceracpi
 S:     Maintained
 
 ACPI
-P:     Len Brown
-M:     len.brown@intel.com
+P:     Andi Kleen
+M:     ak@linux.intel.com
 M:     lenb@kernel.org
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
@@ -239,8 +239,8 @@ W:  http://www.lesswatts.org/projects/acpi/
 S:     Supported
 
 ACPI FAN DRIVER
-P:     Len Brown
-M:     len.brown@intel.com
+P:     Zhang Rui
+M:     rui.zhang@intel.com
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
 S:     Supported
@@ -252,14 +252,14 @@ L:        pcihpd-discuss@lists.sourceforge.net
 S:     Supported
 
 ACPI THERMAL DRIVER
-P:     Len Brown
-M:     len.brown@intel.com
+P:     Zhang Rui
+M:     rui.zhang@intel.com
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
 S:     Supported
 
 ACPI VIDEO DRIVER
-P:     Rui Zhang
+P:     Zhang Rui
 M:     rui.zhang@intel.com
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
@@ -348,7 +348,9 @@ W:  http://www.linux-usb.org/SpeedTouch/
 S:     Maintained
 
 ALCHEMY AU1XX0 MMC DRIVER
-S:     Orphan
+P:     Manuel Lauss
+M:     manuel.lauss@gmail.com
+S:     Maintained
 
 ALI1563 I2C DRIVER
 P:     Rudolf Marek
@@ -2336,6 +2338,16 @@ L:       linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:     Maintained
 
+UBI FILE SYSTEM (UBIFS)
+P:     Artem Bityutskiy
+M:     dedekind@infradead.org
+P:     Adrian Hunter
+M:     ext-adrian.hunter@nokia.com
+L:     linux-mtd@lists.infradead.org
+T:     git git://git.infradead.org/~dedekind/ubifs-2.6.git
+W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
+S:     Maintained
+
 JFS FILESYSTEM
 P:     Dave Kleikamp
 M:     shaggy@austin.ibm.com
@@ -3549,6 +3561,13 @@ L:       linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 
+S3C24XX SD/MMC Driver
+P:     Ben Dooks
+M:     ben-linux@fluff.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+
 SAA7146 VIDEO4LINUX-2 DRIVER
 P:     Michael Hunold
 M:     michael@mihu.de
@@ -3621,6 +3640,12 @@ P:       Jim Cromie
 M:     jim.cromie@gmail.com
 S:     Maintained
 
+SDRICOH_CS MMC/SD HOST CONTROLLER INTERFACE DRIVER
+P:     Sascha Sommer
+M:     saschasommer@freenet.de
+L:     sdricohcs-devel@lists.sourceforge.net (subscribers-only)
+S:     Maintained
+
 SECURITY CONTACT
 P:     Security Officers
 M:     security@kernel.org