Merge remote-tracking branch 'samsung/for-next'

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index 4dd565f84f6fa522d9192847194672cb2aa65492,4678870f8ee8d7a77b7586a70d0b4af3bbbf10d7..189f7158f54fe322c42c5707e86d10245dd1570e
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -987,10 -1007,10 +1024,11 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX51_UART || \
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART || \
 -                               DEBUG_IMX6SL_UART
 +                               DEBUG_IMX6SL_UART || \
 +                               DEBUG_IMX6SX_UART
        default "debug/msm.S" if DEBUG_MSM_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
+       default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
        default "debug/sti.S" if DEBUG_STI_UART
        default "debug/tegra.S" if DEBUG_TEGRA_UART

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

diff --cc drivers/clk/Makefile
Simple merge