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

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index e39caa8,c797a8b..37a3645
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1171,9 -1198,9 +1196,9 @@@ config LOCAL_TIMER
        bool "Use local timer interrupts"
        depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
                REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-               ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
 -              ARCH_U8500 || ARCH_S5PV310)
--      default y
-       select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500)
 -      select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310)
++              ARCH_S5PV310 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
++      select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
++              ARCH_U8500 || ARCH_VEXPRESS)
        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system
@@@ -1184,10 -1211,11 +1209,11 @@@ source kernel/Kconfig.preemp
  
  config HZ
        int
-       default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
 -      default 128 if ARCH_L7200
 -      default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || \
 -                     ARCH_S5PV210 || ARCH_S5PV310
++      default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \
++              ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310
        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
        default AT91_TIMER_HZ if ARCH_AT91
 +      default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
        default 100
  
  config THUMB2_KERNEL

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge