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