Merge branch 'next/late' into for-next

Conflicts:
	arch/arm/mach-shmobile/setup-r8a7778.c

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

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

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

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/include/mach/uncompress.h
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge