Merge "ASoC: msm: Add Slimbus6 playback dai-link"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 18 Aug 2016 19:04:46 +0000 (12:04 -0700)

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

Thu, 18 Aug 2016 19:04:46 +0000 (12:04 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 18 Aug 2016 19:04:46 +0000 (12:04 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 18 Aug 2016 19:04:46 +0000 (12:04 -0700)
diff --cc arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi
Simple merge
diff --cc sound/soc/msm/msmcobalt.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 18 Aug 2016 19:04:46 +0000 (12:04 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 18 Aug 2016 19:04:46 +0000 (12:04 -0700)
		1	2
arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/msm/msmcobalt.c	patch \|	diff1 \|	diff2 \|	blob \| history