Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/tools/mach-types
	drivers/net/ethernet/cadence/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/at91cap9.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-highbank/highbank.c
Simple merge

diff --cc arch/arm/mach-imx/imx51-dt.c
Simple merge

diff --cc arch/arm/mach-imx/imx53-dt.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx51.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx51sd.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx50_rdp.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx51_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx51_efikamx.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx51_efikasb.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_ard.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_evk.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_loco.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx53_smd.c
Simple merge

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-mmp/avengers_lite.c
Simple merge

diff --cc arch/arm/mach-mmp/brownstone.c
Simple merge

diff --cc arch/arm/mach-mmp/flint.c
Simple merge

diff --cc arch/arm/mach-mmp/gplugd.c
Simple merge

diff --cc arch/arm/mach-mmp/include/mach/pxa168.h
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-mmp/tavorevb.c
Simple merge

diff --cc arch/arm/mach-mmp/teton_bga.c
Simple merge

diff --cc arch/arm/mach-mmp/ttc_dkb.c
Simple merge

diff --cc arch/arm/mach-pxa/balloon3.c
Simple merge

diff --cc arch/arm/mach-pxa/capc7117.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x2xx.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa270.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa300.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa320.c
Simple merge

diff --cc arch/arm/mach-pxa/corgi.c
Simple merge

diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge

diff --cc arch/arm/mach-pxa/eseries.c
Simple merge

diff --cc arch/arm/mach-pxa/gumstix.c
Simple merge

diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge

diff --cc arch/arm/mach-pxa/icontrol.c
Simple merge

diff --cc arch/arm/mach-pxa/idp.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/lpd270.c
Simple merge

diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/mioa701.c
Simple merge

diff --cc arch/arm/mach-pxa/palmtc.c
Simple merge

diff --cc arch/arm/mach-pxa/poodle.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/saar.c
Simple merge

diff --cc arch/arm/mach-pxa/saarb.c
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mach-pxa/stargate2.c
Simple merge

diff --cc arch/arm/mach-pxa/tavorevb.c
Simple merge

diff --cc arch/arm/mach-pxa/tavorevb3.c
Simple merge

diff --cc arch/arm/mach-pxa/tosa.c
Simple merge

diff --cc arch/arm/mach-pxa/viper.c
Simple merge

diff --cc arch/arm/mach-pxa/vpac270.c
Simple merge

diff --cc arch/arm/mach-pxa/z2.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc arch/arm/mach-pxa/zylonite.c
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/common.h
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/system.h
index b9c71b409095db90ce3e3d0647a8ec23f76a0da4,b9895d250167cf6b384d5cb1320e00e855537019..13ad0df2e86065bf43cb8882fab90e4fed5b4957
--- 1/arch/arm/plat-mxc/include/mach/system.h
--- 2/arch/arm/plat-mxc/include/mach/system.h
+++ b/arch/arm/plat-mxc/include/mach/system.h
@@@ -17,14 -17,11 +17,9 @@@
  #ifndef __ASM_ARCH_MXC_SYSTEM_H__
  #define __ASM_ARCH_MXC_SYSTEM_H__
  
- extern void (*imx_idle)(void);
- 
  static inline void arch_idle(void)
  {
-       if (imx_idle != NULL)
-               (imx_idle)();
-       else
-               cpu_do_idle();
+       cpu_do_idle();
  }
  
 -void arch_reset(char mode, const char *cmd);
 -
  #endif /* __ASM_ARCH_MXC_SYSTEM_H__ */

diff --cc arch/arm/plat-mxc/system.c
Simple merge

diff --cc drivers/net/ethernet/cadence/Kconfig
index b48378a41e492ce3df245214235c25b901a436c1,a2e150059bc78b38796c6007a6e7d5cb5a7f596d..db931916da08c8ddfd26b9068a94b7dddd1bfb46
--- 1/drivers/net/ethernet/cadence/Kconfig
--- 2/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@@ -5,9 -5,8 +5,9 @@@
  config HAVE_NET_MACB
        bool
  
- config NET_ATMEL
-       bool "Atmel devices"
+ config NET_CADENCE
+       bool "Cadence devices"
 +      default y
        depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y.