Merge branches 'spear/clock' and 'imx/clock' into next/clock