Merge branch 'topic/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Mon, 26 May 2014 14:31:40 +0000 (15:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 26 May 2014 14:31:40 +0000 (15:31 +0100)

Trivial merge