Merge branch 'fixes-omap4-dsp' into fixes-non-critical