Merge branch 'fix/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Fri, 31 Jan 2014 16:38:20 +0000 (16:38 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 31 Jan 2014 16:38:20 +0000 (16:38 +0000)

Trivial merge