1 files changed, 29 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 071a9967434..44756028499 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -789,6 +789,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 T:      git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:      arch/arm/mach-mx*/
+F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
 
 ARM/FREESCALE IMX51
@@ -804,6 +805,13 @@ S:	Maintained
 T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
 F:      arch/arm/mach-imx/*imx6*
 
+ARM/FREESCALE MXS ARM ARCHITECTURE
+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-mxs/
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1789,6 +1797,14 @@ F:	include/net/cfg80211.h
 F:      net/wireless/*
 X:      net/wireless/wext*
 
+CHAR and MISC DRIVERS
+M:      Arnd Bergmann <arnd@arndb.de>
+M:      Greg Kroah-Hartman <greg@kroah.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+S:      Maintained
+F:      drivers/char/*
+F:      drivers/misc/*
+
 CHECKPATCH
 M:      Andy Whitcroft <apw@canonical.com>
 S:      Supported
@@ -1927,9 +1943,11 @@ S:	Maintained
 F:      drivers/connector/
 
 CONTROL GROUPS (CGROUPS)
-M:      Paul Menage <paul@paulmenage.org>
+M:      Tejun Heo <tj@kernel.org>
 M:      Li Zefan <lizf@cn.fujitsu.com>
 L:      containers@lists.linux-foundation.org
+L:      cgroups@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:      Maintained
 F:      include/linux/cgroup*
 F:      kernel/cgroup*
@@ -2584,7 +2602,7 @@ S:	Maintained
 F:      drivers/net/ethernet/i825xx/eexpress.*
 
 ETHERNET BRIDGE
-M:      Stephen Hemminger <shemminger@linux-foundation.org>
+M:      Stephen Hemminger <shemminger@vyatta.com>
 L:      bridge@lists.linux-foundation.org
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net:Bridge
@@ -3718,7 +3736,7 @@ F:	fs/jbd2/
 F:      include/linux/jbd2.h
 
 JSM Neo PCI based serial card
-M:      Breno Leitao <leitao@linux.vnet.ibm.com>
+M:      Lucas Tavares <lucaskt@linux.vnet.ibm.com>
 L:      linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial/jsm/
@@ -4304,6 +4322,7 @@ MEMORY RESOURCE CONTROLLER
 M:      Balbir Singh <bsingharora@gmail.com>
 M:      Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
 M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+L:      cgroups@vger.kernel.org
 L:      linux-mm@kvack.org
 S:      Maintained
 F:      mm/memcontrol.c
@@ -4337,7 +4356,7 @@ MIPS
 M:      Ralf Baechle <ralf@linux-mips.org>
 L:      linux-mips@linux-mips.org
 W:      http://www.linux-mips.org/
-T:      git git://git.linux-mips.org/pub/scm/linux.git
+T:      git git://git.linux-mips.org/pub/scm/ralf/linux.git
 Q:      http://patchwork.linux-mips.org/project/linux-mips/list/
 S:      Supported
 F:      Documentation/mips/
@@ -4470,7 +4489,7 @@ S:	Supported
 F:      drivers/infiniband/hw/nes/
 
 NETEM NETWORK EMULATOR
-M:      Stephen Hemminger <shemminger@linux-foundation.org>
+M:      Stephen Hemminger <shemminger@vyatta.com>
 L:      netem@lists.linux-foundation.org
 S:      Maintained
 F:      net/sched/sch_netem.c
@@ -4947,7 +4966,7 @@ F:	drivers/char/ppdev.c
 F:      include/linux/ppdev.h
 
 PARAVIRT_OPS INTERFACE
-M:      Jeremy Fitzhardinge <jeremy@xensource.com>
+M:      Jeremy Fitzhardinge <jeremy@goop.org>
 M:      Chris Wright <chrisw@sous-sol.org>
 M:      Alok Kataria <akataria@vmware.com>
 M:      Rusty Russell <rusty@rustcorp.com.au>
@@ -5656,7 +5675,6 @@ F:	drivers/media/video/*7146*
 F:      include/media/*7146*
 
 SAMSUNG AUDIO (ASoC) DRIVERS
-M:      Jassi Brar <jassisinghbrar@gmail.com>
 M:      Sangbeom Kim <sbkim73@samsung.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
@@ -5985,7 +6003,7 @@ S:	Maintained
 F:      drivers/usb/misc/sisusbvga/
 
 SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
-M:      Stephen Hemminger <shemminger@linux-foundation.org>
+M:      Stephen Hemminger <shemminger@vyatta.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/marvell/sk*
@@ -7399,8 +7417,8 @@ S:	Maintained
 F:      arch/x86/kernel/cpu/mcheck/*
 
 XEN HYPERVISOR INTERFACE
-M:      Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
 M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+M:      Jeremy Fitzhardinge <jeremy@goop.org>
 L:      xen-devel@lists.xensource.com (moderated for non-subscribers)
 L:      virtualization@lists.linux-foundation.org
 S:      Supported
@@ -7433,7 +7451,8 @@ F:	drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
 P:      Silicon Graphics Inc
-M:      Alex Elder <aelder@sgi.com>
+M:      Ben Myers <bpm@sgi.com>
+M:      Alex Elder <elder@kernel.org>
 M:      xfs-masters@oss.sgi.com
 L:      xfs@oss.sgi.com
 W:      http://oss.sgi.com/projects/xfs