Merge remote-tracking branch 'asoc/fix/fsl-esai' into asoc-linus