Merge branch 'omap-fixes' into omap-fixes-for-linus