Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:24 +0000 (13:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:24 +0000 (13:45 +0100)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge