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