Merge remote-tracking branches 'asoc/topic/sirf-audio', 'asoc/topic/sn95031', 'asoc...

author Mark Brown <[email protected]>

Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)

committer Mark Brown <[email protected]>

Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
author Mark Brown <[email protected]>
Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
committer Mark Brown <[email protected]>
Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
committer	Mark Brown <[email protected]>
	Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
		1	2	3	4	5	6
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history