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)
Conflicts:
sound/soc/fsl/Kconfig


Trivial merge