Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...

author Mark Brown <[email protected]>

Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)

committer Mark Brown <[email protected]>

Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
author Mark Brown <[email protected]>
Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
committer Mark Brown <[email protected]>
Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
diff --cc sound/soc/samsung/i2s.c
Simple merge
diff --cc sound/soc/sunxi/sun8i-codec.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
committer	Mark Brown <[email protected]>
	Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
		1	2	3	4	5	6
sound/soc/samsung/i2s.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/sunxi/sun8i-codec.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history