]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
authorMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 11:05:47 +0000 (12:05 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 11:05:47 +0000 (12:05 +0100)
commitf7514b9c2b2a3a8ae29a02c681f316764c424d40
treef50e57dc2ce4ca1a3f84b6c036c989b5491dc8c5
parent2b30fe1a8a8244cdadecc86d48f2581d30cba6c9
parent324b9565aa2eab66aaa8479df27a9e427141df9d
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm

Conflicts:
sound/soc/fsl/imx-sgtl5000.c
sound/soc/fsl/imx-sgtl5000.c