Merge branch 'omap-rmk'