Merge remote-tracking branches 'asoc/topic/prefix' and 'asoc/topic/rcar' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:22:13 +0000 (21:22 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:22:13 +0000 (21:22 +0000)

Trivial merge