ASoC: Merge fixes

So we can send to Linus.