Merge "ASoC: sdm660_cdc: Fix pop noise when device switch"

author Linux Build Service Account <lnxbuild@quicinc.com>

Wed, 20 Dec 2017 06:27:42 +0000 (22:27 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 20 Dec 2017 06:27:42 +0000 (22:27 -0800)
author Linux Build Service Account <lnxbuild@quicinc.com>
Wed, 20 Dec 2017 06:27:42 +0000 (22:27 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 20 Dec 2017 06:27:42 +0000 (22:27 -0800)
diff --cc sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c
Simple merge
author	Linux Build Service Account <lnxbuild@quicinc.com>
	Wed, 20 Dec 2017 06:27:42 +0000 (22:27 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 20 Dec 2017 06:27:42 +0000 (22:27 -0800)