Merge branch 'omap/omap1' into next/devel