Merge branch 'fixes-omap3' into fixes