Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:48 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:48 +0000 (10:39 +0100)

Trivial merge