Merge remote-tracking branches 'asoc/topic/sigmadsp', 'asoc/topic/sirf', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:07 +0000 (16:32 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:07 +0000 (16:32 +0100)
1  2  3  4  5  6 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge