Merge branch 'omap/hwmod' into next/devel