Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/max98373', 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:50 +0000 (12:43 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:50 +0000 (12:43 +0000)
1  2  3  4  5 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge