Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk