Merge branch 'ib-mfd-omap' into HEAD