Merge remote-tracking branch 'asoc/topic/pcm5102' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:23 +0000 (14:26 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:23 +0000 (14:26 +0100)
1  2 
sound/soc/codecs/Kconfig

Simple merge