Merge branch 'samsung/exynos5' into next/soc2