Merge "ASoC: msm: Fix mute on speaker in VoWLAN calls"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 4 Apr 2017 19:10:24 +0000 (12:10 -0700)

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

Tue, 4 Apr 2017 19:10:23 +0000 (12:10 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 4 Apr 2017 19:10:24 +0000 (12:10 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 4 Apr 2017 19:10:23 +0000 (12:10 -0700)
diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 4 Apr 2017 19:10:24 +0000 (12:10 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 4 Apr 2017 19:10:23 +0000 (12:10 -0700)