ASoC: Merge fixes