Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5514' into asoc...
authorMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:23 +0000 (21:31 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:23 +0000 (21:31 +0000)
1  2  3 
sound/soc/codecs/Makefile

Simple merge