Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e' and...

author Mark Brown <[email protected]>

Fri, 26 Jan 2018 15:27:44 +0000 (15:27 +0000)

committer Mark Brown <[email protected]>

Fri, 26 Jan 2018 15:27:44 +0000 (15:27 +0000)
author Mark Brown <[email protected]>
Fri, 26 Jan 2018 15:27:44 +0000 (15:27 +0000)
committer Mark Brown <[email protected]>
Fri, 26 Jan 2018 15:27:44 +0000 (15:27 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <[email protected]>
	Fri, 26 Jan 2018 15:27:44 +0000 (15:27 +0000)
committer	Mark Brown <[email protected]>
	Fri, 26 Jan 2018 15:27:44 +0000 (15:27 +0000)
		1	2	3	4
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history