Merge remote-tracking branches 'asoc/topic/stac9766', 'asoc/topic/sti', 'asoc/topic...

author Mark Brown <[email protected]>

Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)

committer Mark Brown <[email protected]>

Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
author Mark Brown <[email protected]>
Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
committer Mark Brown <[email protected]>
Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
diff --cc sound/soc/codecs/sti-sas.c
Simple merge
diff --cc sound/soc/sti/uniperif_player.c
Simple merge
author	Mark Brown <[email protected]>
	Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
committer	Mark Brown <[email protected]>
	Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
		1	2	3	4	5	6
sound/soc/codecs/sti-sas.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/sti/uniperif_player.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history