1 files changed, 41 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a618408917bd..a6afe342f0fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -692,6 +692,12 @@ F:	drivers/mtd/nand/bcm_umi_nand.c
 F:      drivers/mtd/nand/bcm_umi_bch.c
 F:      drivers/mtd/nand/nand_bcm_umi.h
 
+ARM/CALXEDA HIGHBANK ARCHITECTURE
+M:      Rob Herring <rob.herring@calxeda.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-highbank/
+
 ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
 M:      Anton Vorontsov <avorontsov@mvista.com>
 S:      Maintained
@@ -791,6 +797,13 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-mx5/
 
+ARM/FREESCALE IMX6
+M:      Shawn Guo <shawn.guo@linaro.org>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
+F:      arch/arm/mach-imx/*imx6*
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2455,8 +2468,6 @@ L:	linux-edac@vger.kernel.org
 W:      bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/i7core_edac.c
-F:      drivers/edac/edac_mce.c
-F:      include/linux/edac_mce.h
 
 EDAC-I82975X
 M:      Ranganathan Desikan <ravi@jetztechnologies.com>
@@ -2480,6 +2491,13 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/r82600_edac.c
 
+EDAC-SBRIDGE
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-edac@vger.kernel.org
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+F:      drivers/edac/sb_edac.c
+
 EDIROL UA-101/UA-1000 DRIVER
 M:      Clemens Ladisch <clemens@ladisch.de>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -3001,6 +3019,13 @@ F:	Documentation/hw_random.txt
 F:      drivers/char/hw_random/
 F:      include/linux/hw_random.h
 
+HARDWARE SPINLOCK CORE
+M:      Ohad Ben-Cohen <ohad@wizery.com>
+S:      Maintained
+F:      Documentation/hwspinlock.txt
+F:      drivers/hwspinlock/hwspinlock_*
+F:      include/linux/hwspinlock.h
+
 HARMONY SOUND DRIVER
 M:      Kyle McMartin <kyle@mcmartin.ca>
 L:      linux-parisc@vger.kernel.org
@@ -3193,8 +3218,7 @@ IA64 (Itanium) PLATFORM
 M:      Tony Luck <tony.luck@intel.com>
 M:      Fenghua Yu <fenghua.yu@intel.com>
 L:      linux-ia64@vger.kernel.org
-W:      http://www.ia64-linux.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:      Maintained
 F:      arch/ia64/
 
@@ -4696,6 +4720,13 @@ S:	Maintained
 F:      drivers/video/omap2/
 F:      Documentation/arm/OMAP/DSS
 
+OMAP HARDWARE SPINLOCK SUPPORT
+M:      Ohad Ben-Cohen <ohad@wizery.com>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      drivers/hwspinlock/omap_hwspinlock.c
+F:      arch/arm/mach-omap2/hwspinlock.c
+
 OMAP MMC SUPPORT
 M:      Jarkko Lavinen <jarkko.lavinen@nokia.com>
 L:      linux-omap@vger.kernel.org
@@ -5358,6 +5389,12 @@ F:	fs/qnx4/
 F:      include/linux/qnx4_fs.h
 F:      include/linux/qnxtypes.h
 
+QUALCOMM HEXAGON ARCHITECTURE
+M:      Richard Kuo <rkuo@codeaurora.org>
+L:      linux-hexagon@vger.kernel.org
+S:      Supported
+F:      arch/hexagon/
+
 RADOS BLOCK DEVICE (RBD)
 F:      include/linux/qnxtypes.h
 M:      Yehuda Sadeh <yehuda@hq.newdream.net>
@@ -6663,7 +6700,6 @@ F:	drivers/net/ethernet/8390/ne-h8300.c
 
 UDF FILESYSTEM
 M:      Jan Kara <jack@suse.cz>
-W:      http://linux-udf.sourceforge.net
 S:      Maintained
 F:      Documentation/filesystems/udf.txt
 F:      fs/udf/