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