Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)

Trivial merge