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