Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:23:55 +0000 (11:23 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:23:55 +0000 (11:23 +0100)

Trivial merge