Merge branch 'mxs/for-arnd' of git://git.linaro.org/people/shawnguo/linux-2.6 into...

diff --combined MAINTAINERS
index c9ae02a,8fe3f01..8962427
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -789,7 -789,6 +789,7 @@@ L: linux-arm-kernel@lists.infradead.or
  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
@@@ -805,6 -804,13 +805,13 @@@ S:       Maintaine
  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)
@@@ -1033,7 -1039,6 +1040,7 @@@ F:      arch/arm/include/asm/hardware/ioc.
  F:    arch/arm/include/asm/hardware/iomd.h
  F:    arch/arm/include/asm/hardware/memc.h
  F:    arch/arm/mach-rpc/
 +F:    drivers/net/ethernet/8390/etherh.c
  F:    drivers/net/ethernet/i825xx/ether1*
  F:    drivers/net/ethernet/seeq/ether3*
  F:    drivers/scsi/arm/
@@@ -1107,7 -1112,6 +1114,7 @@@ F:      drivers/media/video/s5p-fimc
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Kamil Debski <k.debski@samsung.com>
 +M:     Jeongtae Park <jtp.park@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -1719,7 -1723,6 +1726,7 @@@ F:      include/linux/can.
  F:    include/linux/can/core.h
  F:    include/linux/can/bcm.h
  F:    include/linux/can/raw.h
 +F:    include/linux/can/gw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
@@@ -2344,13 -2347,6 +2351,13 @@@ S:    Supporte
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
  
 +DRM DRIVERS FOR EXYNOS
 +M:    Inki Dae <inki.dae@samsung.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Supported
 +F:    drivers/gpu/drm/exynos
 +F:    include/drm/exynos*
 +
  DSCC4 DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -2397,7 -2393,7 +2404,7 @@@ F:      include/linux/netfilter_bridge/ebt_*
  F:    net/bridge/netfilter/ebt*.c
  
  ECRYPT FILE SYSTEM
 -M:    Tyler Hicks <tyhicks@linux.vnet.ibm.com>
 +M:    Tyler Hicks <tyhicks@canonical.com>
  M:    Dustin Kirkland <kirkland@canonical.com>
  L:    ecryptfs@vger.kernel.org
  W:    https://launchpad.net/ecryptfs
@@@ -4487,9 -4483,11 +4494,9 @@@ F:     Documentation/networking/vxge.tx
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER/IPTABLES/IPCHAINS
 -P:    Rusty Russell
 -P:    Marc Boucher
 -P:    James Morris
  P:    Harald Welte
  P:    Jozsef Kadlecsik
 +M:    Pablo Neira Ayuso <pablo@netfilter.org>
  M:    Patrick McHardy <kaber@trash.net>
  L:    netfilter-devel@vger.kernel.org
  L:    netfilter@vger.kernel.org
@@@ -4682,7 -4680,7 +4689,7 @@@ L:      linux-omap@vger.kernel.or
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:    Maintained
  F:    arch/arm/*omap*/
  
@@@ -5480,7 -5478,7 +5487,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Andy Grover <andy.grover@oracle.com>
 +M:    Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
  S:    Supported
  F:    net/rds/
@@@ -6131,7 -6129,7 +6138,7 @@@ F:      sound
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lrg@ti.com>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported