Merge branch 'exynos-fix' of .git into next