1 files changed, 57 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index acf11052cb7d..303129ab4b75 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -653,6 +653,8 @@ M:	laforge@openezx.org
 L:      openezx-devel@lists.openezx.org (subscribers-only)
 W:      http://www.openezx.org/
 S:      Maintained
+T:      topgit git://git.openezx.org/openezx.git
+F:      arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
 P:      Paulius Zaleckas
@@ -774,11 +776,25 @@ P:	Philipp Zabel
 M:      philipp.zabel@gmail.com
 S:      Maintained
 
+ARM/MIOA701 MACHINE SUPPORT
+P:      Robert Jarzmik
+M:      robert.jarzmik@free.fr
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+F:      arch/arm/mach-pxa/mioa701.c
+S:      Maintained
+
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 P:      Michael Petchkovsky
 M:      mkpetch@internode.on.net
 S:      Maintained
 
+ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
+P:      Nelson Castillo
+M:      arhuaco@freaks-unidos.net
+L:      openmoko-kernel@lists.openmoko.org (subscribers-only)
+W:      http://wiki.openmoko.org/wiki/Neo_FreeRunner
+S:      Supported
+
 ARM/TOSA MACHINE SUPPORT
 P:      Dmitry Eremin-Solenikov
 M:      dbaryshkov@gmail.com
@@ -792,6 +808,12 @@ M:	marek.vasut@gmail.com
 W:      http://hackndev.com
 S:      Maintained
 
+ARM/PALM TREO 680 SUPPORT
+P:      Tomas Cech
+M:      sleep_walker@suse.cz
+W:      http://hackndev.com
+S:      Maintained
+
 ARM/PALMZ72 SUPPORT
 P:      Sergey Lapin
 M:      slapin@ossfans.org
@@ -946,7 +968,7 @@ M:	me@bobcopeland.com
 L:      linux-wireless@vger.kernel.org
 L:      ath5k-devel@lists.ath5k.org
 S:      Maintained
-F:      drivers/net/wireless/ath5k/
+F:      drivers/net/wireless/ath/ath5k/
 
 ATHEROS ATH9K WIRELESS DRIVER
 P:      Luis R. Rodriguez
@@ -962,7 +984,7 @@ M:	senthilkumar@atheros.com
 L:      linux-wireless@vger.kernel.org
 L:      ath9k-devel@lists.ath9k.org
 S:      Supported
-F:      drivers/net/wireless/ath9k/
+F:      drivers/net/wireless/ath/ath9k/
 
 ATHEROS AR9170 WIRELESS DRIVER
 P:      Christian Lamparter
@@ -970,7 +992,7 @@ M:	chunkeey@web.de
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org/en/users/Drivers/ar9170
 S:      Maintained
-F:      drivers/net/wireless/ar9170/
+F:      drivers/net/wireless/ath/ar9170/
 
 ATI_REMOTE2 DRIVER
 P:      Ville Syrjala
@@ -1010,6 +1032,13 @@ W:	http://www.at91.com/
 S:      Maintained
 F:      drivers/mmc/host/at91_mci.c
 
+ATMEL AT91 / AT32 MCI DRIVER
+P:      Nicolas Ferre
+M:      nicolas.ferre@atmel.com
+S:      Maintained
+F:      drivers/mmc/host/atmel-mci.c
+F:      drivers/mmc/host/atmel-mci-regs.h
+
 ATMEL AT91 / AT32 SERIAL DRIVER
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
@@ -2053,8 +2082,8 @@ F:	drivers/edac/i5400_edac.c
 
 EDAC-I82975X
 P:      Ranganathan Desikan
-P:      Arvind R.
 M:      rdesikan@jetzbroadband.com
+P:      Arvind R.
 M:      arvind@acarlab.com
 L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      bluesmoke.sourceforge.net
@@ -2390,7 +2419,7 @@ FTRACE
 P:      Steven Rostedt
 M:      rostedt@goodmis.org
 S:      Maintained
-F:      Documentation/ftrace.txt
+F:      Documentation/trace/ftrace.txt
 F:      arch/*/*/*/ftrace.h
 F:      arch/*/kernel/ftrace.c
 F:      include/*/ftrace.h
@@ -2803,10 +2832,10 @@ S:	Supported
 F:      drivers/scsi/ips.*
 
 IDE SUBSYSTEM
-P:      Bartlomiej Zolnierkiewicz
-M:      bzolnier@gmail.com
+P:      David S. Miller
+M:      davem@davemloft.net
 L:      linux-ide@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
 S:      Maintained
 F:      Documentation/ide/
 F:      drivers/ide/
@@ -2854,10 +2883,10 @@ P:	Sergey Lapin
 M:      slapin@ossfans.org
 L:      linux-zigbee-devel@lists.sourceforge.net
 W:      http://apps.sourceforge.net/trac/linux-zigbee
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
 S:      Maintained
 F:      net/ieee802154/
-F:      drivers/ieee801254/
+F:      drivers/ieee802154/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 P:      Mimi Zohar
@@ -3231,7 +3260,6 @@ W:	http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:      Maintained
 F:      fs/jffs2/
 F:      include/linux/jffs2.h
-F:      include/mtd/jffs2-user.h
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 P:      Stephen Tweedie
@@ -3414,7 +3442,7 @@ P:	Eduard - Gabriel Munteanu
 M:      eduard.munteanu@linux360.ro
 S:      Maintained
 F:      Documentation/trace/kmemtrace.txt
-F:      include/trace/kmemtrace.h
+F:      include/linux/kmemtrace.h
 F:      kernel/trace/kmemtrace.c
 
 KPROBES
@@ -4091,7 +4119,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 F:      net/wireless/
 F:      include/net/ieee80211*
-F:      include/net/wireless.h
+F:      include/linux/wireless.h
 
 NETWORKING DRIVERS
 L:      netdev@vger.kernel.org
@@ -5102,6 +5130,13 @@ L:	sdhci-devel@lists.ossman.eu
 S:      Maintained
 F:      drivers/mmc/host/sdhci.*
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
+P:      Ben Dooks
+M:      ben-linux@fluff.org
+L:      sdhci-devel@lists.ossman.eu
+S:      Maintained
+F:      drivers/mmc/host/sdhci-s3c.c
+
 SECURITY SUBSYSTEM
 P:      James Morris
 M:      jmorris@namei.org
@@ -5487,6 +5522,7 @@ STAGING SUBSYSTEM
 P:      Greg Kroah-Hartman
 M:      gregkh@suse.de
 T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+L:      devel@driverdev.osuosl.org
 S:      Maintained
 F:      drivers/staging/
 
@@ -6223,6 +6259,14 @@ S:	Maintained
 F:      Documentation/i2c/busses/i2c-viapro
 F:      drivers/i2c/busses/i2c-viapro.c
 
+VIA SD/MMC CARD CONTROLLER DRIVER
+P:      Joseph Chan
+M:      JosephChan@via.com.tw
+P:      Harald Welte
+M:      HaraldWelte@viatech.com
+S:      Maintained
+F:      drivers/mmc/host/via-sdmmc.c
+
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 P:      Joseph Chan
 M:      JosephChan@via.com.tw