Merge branch 'pm-omap'