Merge branch 'next/cleanup-samsung' into for-next
Merge branch 'next/clk-exynos' into for-next

Conflicts:
	arch/arm/boot/dts/exynos4.dtsi
	arch/arm/boot/dts/exynos4210.dtsi
	arch/arm/boot/dts/exynos5250.dtsi
	arch/arm/boot/dts/exynos5440.dtsi
	arch/arm/mach-exynos/common.h
Merge branch 'next/clk-exynos-2' into for-next