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)
commit287d414eacaa681413ea89adfa5b3a0d12d2ab1a
treea4ef6c55bc2b2177f8a4144663c68e6e345b64cc
parent432481220101166a0b33dc6f951b38a8af3d281c
parent7b8751abdd34a2f924c37c29ad61d598f5d29e7b
Merge branch 'topic/fsl' of git://git./linux/kernel/git/broonie/sound into asoc-fsl-ssi

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