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