Merge branch 'omap/fixes-hwmod' into next/fixes-non-critical