Merge branch 'omap-fixes'