Merge branch 'topic/cs42l56' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Tue, 9 Sep 2014 20:08:02 +0000 (21:08 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 9 Sep 2014 20:08:02 +0000 (21:08 +0100)

Trivial merge