[GIT PULL] ASoC fixes for v6.1-rc6