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

Conflicts:
	arch/arm/mm/Kconfig

diff --combined arch/arm/mm/Kconfig
index 2bd4ccfb353864c9bd85796efdc6331372f5a016,0f59e54e93989c47450a8f23e201df4f6c3c832b..c2eafd993bc3460d3bc6602492a29e70d87f72dc
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -811,8 -811,8 +811,8 @@@ config CACHE_FEROCEON_L2_WRITETHROUG
  config CACHE_L2X0
        bool "Enable the L2x0 outer cache controller"
        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
 -                 REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \
 +                 REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
-                  ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \
+                  ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
                   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE
        default y
        select OUTER_CACHE

diff --combined drivers/tty/serial/Kconfig
index 5c4b3475621fb34eb2b4eb383032bc3df8868d02,8f144d029a4b78e8e8988b3b8031d2b3abadb47e..aa9d3d11031dcc00ddc0bcdafddd6375c5c2b908
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -537,8 -537,8 +537,8 @@@ config SERIAL_S3C640
  
  config SERIAL_S5PV210
        tristate "Samsung S5PV210 Serial port support"
-       depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_S5PV310)
-       select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_S5PV310)
+       depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_EXYNOS4210)
+       select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210)
        default y
        help
          Serial port support for Samsung's S5P Family of SoC's
@@@ -1596,19 -1596,4 +1596,19 @@@ config SERIAL_PCH_UAR
          This driver is for PCH(Platform controller Hub) UART of Intel EG20T
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          Enabling PCH_DMA, this PCH UART works as DMA mode.
 +
 +config SERIAL_MXS_AUART
 +      depends on ARCH_MXS
 +      tristate "MXS AUART support"
 +      select SERIAL_CORE
 +      help
 +        This driver supports the MXS Application UART (AUART) port.
 +
 +config SERIAL_MXS_AUART_CONSOLE
 +      bool "MXS AUART console support"
 +      depends on SERIAL_MXS_AUART=y
 +      select SERIAL_CORE_CONSOLE
 +      help
 +        Enable a MXS AUART port to be the system console.
 +
  endmenu