Merge "ASoC: msm: qdsp6v2: add support for tx app type config"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 10 Nov 2016 23:14:38 +0000 (15:14 -0800)

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

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