Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:53 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:53 +0000 (10:39 +0100)

Trivial merge