Merge branch 'omap-clock-fixes' into omap-fixes