Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus