Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5677' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
commit770b65c3da673f39ee00aaf50fcc0f895eda467d
tree7b9285895c6ef9c17bf670f6f8600b5207625699
parent440a5285589d4abc7f7c44f063a3554557820ab6
parentd92950e755328a0293af66e18096e0cae29996f1
parent0e826e86726423df5c3841d0a34a2edcd64a93e2
Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5677' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/rt5640.c