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