Merge tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...

From Santosh Shilimkar:
SOC support for Keystone II devices:
- Minimal machine and device-tree support with arch_timers and console UART
- Reboot hook using PLL reset
- Low level debug support using UART
- SMP boot support

* tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: Enable SMP support on Keystone machines
  ARM: keystone: Add minimal TI Keystone platform support
  ARM: dts: keystone: Add minimal Keystone SOC device tree data

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index e6a6ab1b10d7948f64aecc3bdf583a29df913822,62e7f95c66438ff9802f8ee0c917bcc449f67b70..d2b000a31b47edaa2349821496bd07d361ade6ce
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -657,8 -646,9 +671,10 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX51_UART || \
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART
 -      default "debug/mvebu.S" if DEBUG_MVEBU_UART
+       default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
+                                     DEBUG_KEYSTONE_UART1
 +      default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
 +                                 DEBUG_MVEBU_UART_ALTERNATE
        default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
        default "debug/nomadik.S" if DEBUG_NOMADIK_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

diff --cc arch/arm/Makefile
Simple merge