1 files changed, 40 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 94381eddccfa..efd2ef2c2660 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -835,13 +835,13 @@ F:	arch/arm/mach-pxa/palmte2.c
 F:      arch/arm/mach-pxa/include/mach/palmtc.h
 F:      arch/arm/mach-pxa/palmtc.c
 
-ARM/PALM TREO 680 SUPPORT
+ARM/PALM TREO SUPPORT
 M:      Tomas Cech <sleep_walker@suse.cz>
 L:      linux-arm-kernel@lists.infradead.org
 W:      http://hackndev.com
 S:      Maintained
-F:      arch/arm/mach-pxa/include/mach/treo680.h
-F:      arch/arm/mach-pxa/treo680.c
+F:      arch/arm/mach-pxa/include/mach/palmtreo.h
+F:      arch/arm/mach-pxa/palmtreo.c
 
 ARM/PALMZ72 SUPPORT
 M:      Sergey Lapin <slapin@ossfans.org>
@@ -1482,8 +1482,8 @@ F:	include/linux/coda*.h
 
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:      Steve French <sfrench@samba.org>
-L:      linux-cifs-client@lists.samba.org
-L:      samba-technical@lists.samba.org
+L:      linux-cifs-client@lists.samba.org (moderated for non-subscribers)
+L:      samba-technical@lists.samba.org (moderated for non-subscribers)
 W:      http://linux-cifs.samba.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:      Supported
@@ -2377,6 +2377,15 @@ W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:      Maintained
 F:      drivers/hwmon/hdaps.c
 
+HWPOISON MEMORY FAILURE HANDLING
+M:      Andi Kleen <andi@firstfloor.org>
+L:      linux-mm@kvack.org
+L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
+S:      Maintained
+F:      mm/memory-failure.c
+F:      mm/hwpoison-inject.c
+
 HYPERVISOR VIRTUAL CONSOLE DRIVER
 L:      linuxppc-dev@ozlabs.org
 S:      Odd Fixes
@@ -3081,8 +3090,11 @@ S:	Maintained
 F:      fs/autofs4/
 
 KERNEL BUILD
+M:      Michal Marek <mmarek@suse.cz>
+T:      git git://repo.or.cz/linux-kbuild.git for-next
+T:      git git://repo.or.cz/linux-kbuild.git for-linus
 L:      linux-kbuild@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      Documentation/kbuild/
 F:      Makefile
 F:      scripts/Makefile.*
@@ -3124,7 +3136,6 @@ L:	kvm@vger.kernel.org
 W:      http://kvm.qumranet.com
 S:      Supported
 F:      arch/x86/include/asm/svm.h
-F:      arch/x86/kvm/kvm_svm.h
 F:      arch/x86/kvm/svm.c
 
 KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
@@ -3260,6 +3271,7 @@ LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
 W:      http://www.ibm.com/linux/ltc/projects/ppc
 S:      Supported
+F:      arch/powerpc/boot/rs6000.h
 
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@ -3268,18 +3280,24 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 S:      Supported
+F:      Documentation/powerpc/
+F:      arch/powerpc/
 
 LINUX FOR POWER MACINTOSH
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
+F:      arch/powerpc/platforms/powermac/
+F:      drivers/macintosh/
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
+F:      arch/powerpc/platforms/512x/
+F:      arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
 M:      Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@ -3288,6 +3306,8 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:      Maintained
+F:      arch/powerpc/platforms/40x/
+F:      arch/powerpc/platforms/44x/
 
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 M:      Grant Likely <grant.likely@secretlab.ca>
@@ -3295,6 +3315,8 @@ W:	http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:      linuxppc-dev@ozlabs.org
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
+F:      arch/powerpc/*/*virtex*
+F:      arch/powerpc/*/*/*virtex*
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 M:      Vitaly Bordug <vitb@kernel.crashing.org>
@@ -3308,12 +3330,16 @@ M:	Kumar Gala <galak@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
+F:      arch/powerpc/platforms/83xx/
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 M:      Olof Johansson <olof@lixom.net>
 W:      http://www.pasemi.com/
 L:      linuxppc-dev@ozlabs.org
 S:      Supported
+F:      arch/powerpc/platforms/pasemi/
+F:      drivers/*/*pasemi*
+F:      drivers/*/*/*pasemi*
 
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:      Chris Wright <chrisw@sous-sol.org>
@@ -5065,6 +5091,7 @@ F:	drivers/char/specialix*
 
 SPI SUBSYSTEM
 M:      David Brownell <dbrownell@users.sourceforge.net>
+M:      Grant Likely <grant.likely@secretlab.ca>
 L:      spi-devel-general@lists.sourceforge.net
 S:      Maintained
 F:      Documentation/spi/
@@ -5964,6 +5991,7 @@ M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
 T:      git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:      http://opensource.wolfsonmicro.com/node/8
 S:      Supported
+F:      Documentation/hwmon/wm83??
 F:      drivers/leds/leds-wm83*.c
 F:      drivers/mfd/wm8*.c
 F:      drivers/power/wm83*.c
@@ -5973,14 +6001,14 @@ F:	drivers/video/backlight/wm83*_bl.c
 F:      drivers/watchdog/wm83*_wdt.c
 F:      include/linux/mfd/wm831x/
 F:      include/linux/mfd/wm8350/
-F:      include/linux/mfd/wm8400/
-F:      sound/soc/codecs/wm8350.c
-F:      sound/soc/codecs/wm8400.c
+F:      include/linux/mfd/wm8400*
+F:      sound/soc/codecs/wm8350.*
+F:      sound/soc/codecs/wm8400.*
 
 X.25 NETWORK LAYER
-M:      Henner Eisen <eis@baty.hanse.de>
+M:      Andrew Hendry <andrew.hendry@gmail.com>
 L:      linux-x25@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/networking/x25*
 F:      include/net/x25*
 F:      net/x25/