Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/max98373', 'asoc...

author Mark Brown <[email protected]>

Fri, 5 Jan 2018 12:43:50 +0000 (12:43 +0000)

committer Mark Brown <[email protected]>

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