Merge branch 'topic/es8328' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Sat, 16 Aug 2014 22:18:02 +0000 (17:18 -0500)
committerMark Brown <broonie@linaro.org>
Sat, 16 Aug 2014 22:18:02 +0000 (17:18 -0500)

Trivial merge