Merge "ASoC: msm: Add routing controls for hfp, port mixer"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 21 Dec 2016 23:48:08 +0000 (15:48 -0800)

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

Wed, 21 Dec 2016 23:48:08 +0000 (15:48 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 21 Dec 2016 23:48:08 +0000 (15:48 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 21 Dec 2016 23:48:08 +0000 (15:48 -0800)
diff --cc sound/soc/msm/msmfalcon-internal.c
Simple merge
diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 21 Dec 2016 23:48:08 +0000 (15:48 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 21 Dec 2016 23:48:08 +0000 (15:48 -0800)
		1	2
sound/soc/msm/msmfalcon-internal.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c	patch \|	diff1 \|	diff2 \|	blob \| history