Merge remote-tracking branch 'asoc/fix/davinci' into asoc-davinci
authorMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:08:39 +0000 (22:08 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:08:39 +0000 (22:08 +0100)

Trivial merge