Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
	arch/arm/Kconfig.debug

diff --cc arch/arm/Kconfig.debug
index 2d57da32456278118bc9a52390036a87dc8d3651,0aa5b9d498f8d240b27cef63a94629172d9333f0..38c92d7b74c1b978c0d9162ed20486e0646ee49c
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -879,12 -782,30 +886,13 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART || \
                                 DEBUG_IMX6SL_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/nspire.S" if     DEBUG_NSPIRE_CX_UART || \
 -                                      DEBUG_NSPIRE_CLASSIC_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
 -      default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
 -      default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
 -                               DEBUG_MMP_UART3
 -      default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
 -      default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
        default "debug/sti.S" if DEBUG_STI_UART
 -      default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
        default "debug/tegra.S" if DEBUG_TEGRA_UART
 -      default "debug/u300.S" if DEBUG_U300_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
 -      default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 -              DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \
 -              DEBUG_VEXPRESS_UART0_CRX
 +      default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
+       default "debug/vf.S" if DEBUG_VF_UART
        default "debug/vt8500.S" if DEBUG_VT8500_UART0
        default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
        default "mach/debug-macro.S"

diff --cc arch/arm/boot/dts/Makefile
Simple merge

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