Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/Kconfig.debug

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index 9afabbb5e798e8cf95d34c9c508bdab2c430b1cc,bda94e46e8d6cf605b51b980da253aab66e8979d..0531da8e5216e442ee1f9c8878e4fb9d84611581
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -106,17 -94,14 +106,25 @@@ choic
                depends on ARCH_BCM2835
                select DEBUG_UART_PL01X
  
 +      config DEBUG_BCM_KONA_UART
 +              bool "Kernel low-level debugging messages via BCM KONA UART"
 +              depends on ARCH_BCM
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on Broadcom SoC platforms.
 +                This low level debug works for Broadcom
 +                mobile SoCs in the Kona family of chips (e.g. bcm28155,
 +                bcm11351, etc...)
 +
+       config DEBUG_BERLIN_UART
+               bool "Marvell Berlin SoC Debug UART"
+               depends on ARCH_BERLIN
+               select DEBUG_UART_8250
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on Marvell Berlin SoC based platforms.
+ 
        config DEBUG_CLPS711X_UART1
                bool "Kernel low-level debugging messages via UART1"
                depends on ARCH_CLPS711X

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

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/mach-at91/setup.c
Simple merge

diff --cc arch/arm/mach-ux500/setup.h
Simple merge

diff --cc drivers/clk/samsung/clk-exynos4.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-baytrail.c
Simple merge