]> 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)
commit42365952ef96725eb060673634bf5f84b31c06ad
tree3b19eb54c684e36feab568078018dea31c43a79f
parent51244a5ae882f36e4641affd7ede934f061439cc
parente194e01365da4e20651b022a38173a0d75f31751
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl

Conflicts:
sound/soc/fsl/fsl_ssi.c