Merge branch 'next-exynos4' into for-next