]> 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)
commitccdff10cc7e69e22d747d590372ab287a4d019fc
treea4ef6c55bc2b2177f8a4144663c68e6e345b64cc
parent211b836dd2e73d88f8b9ae139c99a5216572a6d0
parent72c7eaf6e00b3d7d67d8f6b46104a737e31b8107
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