Merge commit 'topic/omap' into asoc-davinci
authorMark Brown <broonie@linaro.org>
Fri, 18 Apr 2014 17:02:49 +0000 (18:02 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Apr 2014 17:02:49 +0000 (18:02 +0100)

Trivial merge