[GIT PULL] ASoC fixes for v7.0-rc1