]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl
authorMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 16:29:05 +0000 (17:29 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 16:29:05 +0000 (17:29 +0100)
commit8e0979cb6f2dad316438ca1a4f13ec652e76b8a0
tree3b19eb54c684e36feab568078018dea31c43a79f
parent22ccad68fa9f9f9ddd5c5bec85db46ea1dee32bb
parent3866583d055e668ec038f71e45627712ac70c13d
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl

Conflicts:
sound/soc/fsl/fsl_ssi.c