Merge branch 'next-exynos4' into next-exynos4-pm