ASoC: Merge up fixes from Linus' tree