Merge "msm: qdsp6v2: extend media format provided to voice driver"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 20 Dec 2016 22:04:49 +0000 (14:04 -0800)

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

Tue, 20 Dec 2016 22:04:49 +0000 (14:04 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 20 Dec 2016 22:04:49 +0000 (14:04 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 20 Dec 2016 22:04:49 +0000 (14:04 -0800)
diff --cc include/sound/apr_audio-v2.h
Simple merge
diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 20 Dec 2016 22:04:49 +0000 (14:04 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 20 Dec 2016 22:04:49 +0000 (14:04 -0800)
		1	2
include/sound/apr_audio-v2.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c	patch \|	diff1 \|	diff2 \|	blob \| history