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