Merge branch 'topic/omap' into for-linus