Merge "ASoC: msm: qdsp6v2: Add INT3 Tx port for LSM"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 10 Feb 2017 14:46:06 +0000 (06:46 -0800)

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

Fri, 10 Feb 2017 14:46:05 +0000 (06:46 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 10 Feb 2017 14:46:06 +0000 (06:46 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 10 Feb 2017 14:46:05 +0000 (06:46 -0800)
diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Simple merge
diff --cc sound/soc/msm/qdsp6v2/q6afe.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 10 Feb 2017 14:46:06 +0000 (06:46 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 10 Feb 2017 14:46:05 +0000 (06:46 -0800)
		1	2
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/msm/qdsp6v2/q6afe.c	patch \|	diff1 \|	diff2 \|	blob \| history