Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-at91/include/mach/system.h
index bfbb612265d69b0fbf39a6c36b756b9a8783a11f,ee8db152592e087c8fe986dd1c7d7e557d473ad4..36af14bc13bbbbc88aad80487b6d3cc85b924f0b
--- 1/arch/arm/mach-at91/include/mach/system.h
--- 2/arch/arm/mach-at91/include/mach/system.h
+++ b/arch/arm/mach-at91/include/mach/system.h
@@@ -33,16 -32,12 +32,16 @@@ static inline void arch_idle(void
         * Disable the processor clock.  The processor will be automatically
         * re-enabled by an interrupt or by a reset.
         */
 +#ifdef AT91_PS
 +      at91_sys_write(AT91_PS_CR, AT91_PS_CR_CPU);
 +#else
        at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
- #else
 +#endif
+ #ifndef CONFIG_CPU_ARM920T
        /*
         * Set the processor (CP15) into 'Wait for Interrupt' mode.
-        * Unlike disabling the processor clock via the PMC (above)
-        *  this allows the processor to be woken via JTAG.
+        * Post-RM9200 processors need this in conjunction with the above
+        * to save power when idle.
         */
        cpu_do_idle();
  #endif

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index 28f73a1c79f7c24c1f17d7e71a307dc7e1eb0fd7,6830afd1d2baf01bc60aa959d15841aed48e26a6..a1681fc9d9b066a3a5f274264af605ef1a2e5373
--- 1/arch/arm/mach-imx/mach-cpuimx27.c
--- 2/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -258,9 -259,8 +258,9 @@@ static void __init eukrea_cpuimx27_init
        i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
                                ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
  
-       imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
 -      imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
++      imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
  
 +      imx27_add_fec(NULL);
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
  
  #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)

diff --cc drivers/net/Kconfig
Simple merge