]> 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)
commite247a9540bacceb5f8c27f16313bd85fa9d04333
treef50e57dc2ce4ca1a3f84b6c036c989b5491dc8c5
parent36f91f45d64cf92e5d81041a3d8f7dbfda490f2a
parent99607260b5fa0e935a77a291a52752e4fce08c74
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm

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