Merge remote-tracking branches 'asoc/topic/sun4i-i2s', 'asoc/topic/sunxi', 'asoc...

author Mark Brown <[email protected]>

Fri, 5 Jan 2018 12:44:06 +0000 (12:44 +0000)

committer Mark Brown <[email protected]>

Fri, 5 Jan 2018 12:44:06 +0000 (12:44 +0000)
author Mark Brown <[email protected]>
Fri, 5 Jan 2018 12:44:06 +0000 (12:44 +0000)
committer Mark Brown <[email protected]>
Fri, 5 Jan 2018 12:44:06 +0000 (12:44 +0000)
diff --cc include/sound/soc-dai.h
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/sunxi/sun4i-i2s.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 5 Jan 2018 12:44:06 +0000 (12:44 +0000)
committer	Mark Brown <[email protected]>
	Fri, 5 Jan 2018 12:44:06 +0000 (12:44 +0000)
		1	2	3	4	5	6
include/sound/soc-dai.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/sunxi/sun4i-i2s.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history