Merge branch 'omap/cleanup' into next/cleanup2