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