Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:23 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:23 +0000 (16:15 +0100)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge