Merge branch 'omap-clks3' into devel