Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --combined drivers/serial/Kconfig
index 047c20d35a9890676ddd1e428b6b778702a38067,18ca9075e131a48e3403ff61ccbf7abc3691b38f..09f6346d38a8127b6a05d58c4c2b9c3fc23d1b77
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -451,7 -451,6 +451,7 @@@ config SERIAL_CLPS711X_CONSOL
  config SERIAL_SAMSUNG
        tristate "Samsung SoC serial support"
        depends on ARM && PLAT_S3C24XX
 +      select SERIAL_CORE
        help
          Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
@@@ -790,7 -789,7 +790,7 @@@ config BFIN_UART3_CTSRT
  
  config SERIAL_IMX
        bool "IMX serial port support"
-       depends on ARM && ARCH_IMX
+       depends on ARM && (ARCH_IMX || ARCH_MXC)
        select SERIAL_CORE
        help
          If you have a machine based on a Motorola IMX CPU you