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