Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Mon, 10 Jun 2013 09:26:16 +0000 (10:26 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 10 Jun 2013 09:26:16 +0000 (10:26 +0100)

Trivial merge