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)
commit8e9c4aa4e7bd600d30e15ec82be9b670a1ec3da9
tree3b19eb54c684e36feab568078018dea31c43a79f
parentd60336e2f136287de821901d4a1b56179a0f7b69
parent1d73ad298d1bfeee5d77c19e5cd667c551e30632
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl

Conflicts:
sound/soc/fsl/fsl_ssi.c