Merge remote-tracking branch 'asoc/topic/fsl-ssi' into asoc-next
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:49 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:49 +0000 (10:39 +0100)
1  2 
sound/soc/fsl/Kconfig

Simple merge