Merge branch 'omap-fixes' into fixes