ARM: arm-soc: Merge branch 'next/pm2' into next/pm