Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 15 Jul 2013 10:13:53 +0000 (11:13 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 15 Jul 2013 10:13:53 +0000 (11:13 +0100)

Trivial merge