1 files changed, 41 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e53c1c566caf..cf5a46ef6b3f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -968,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
@@ -984,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
@@ -992,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
@@ -1032,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
@@ -1566,6 +1573,7 @@ L:	containers@lists.linux-foundation.org
 S:      Maintained
 F:      include/linux/cgroup*
 F:      kernel/cgroup*
+F:      mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
 P:      Rudolf Marek
@@ -2074,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
@@ -2296,11 +2304,9 @@ F:	drivers/net/wan/dlci.c
 F:      drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-P:      Antonino Daplas
-M:      adaplas@gmail.com
 L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://linux-fbdev.sourceforge.net/
-S:      Maintained
+S:      Orphan
 F:      Documentation/fb/
 F:      drivers/video/fb*
 F:      include/linux/fb.h
@@ -2413,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
@@ -2869,10 +2875,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
@@ -3429,7 +3435,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
@@ -4106,7 +4112,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
@@ -4600,6 +4606,13 @@ S:	Maintained
 F:      drivers/net/pppol2tp.c
 F:      include/linux/if_pppol2tp.h
 
+PPS SUPPORT
+P:      Rodolfo Giometti
+M:      giometti@enneenne.com
+W:      http://wiki.enneenne.com/index.php/LinuxPPS_support
+L:      linuxpps@ml.enneenne.com (subscribers-only)
+S:      Maintained
+
 PREEMPTIBLE KERNEL
 P:      Robert Love
 M:      rml@tech9.net
@@ -5110,6 +5123,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
@@ -5495,6 +5515,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/
 
@@ -6231,6 +6252,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