]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 13:02:07 +0000 (14:02 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 13:02:07 +0000 (14:02 +0100)
commit01cfeeb633be97fcf9330f369467fc77d4cf60ea
treea4ef6c55bc2b2177f8a4144663c68e6e345b64cc
parent91351ef15b2ff4140939a9547917a1e4617d4b0b
parentec7a85b1b67ca4630e899436f013f016a0a988e7
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi

Conflicts:
sound/soc/fsl/Kconfig
sound/soc/fsl/Kconfig
sound/soc/fsl/fsl_ssi.c