Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
authorMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:22:15 +0000 (21:22 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:22:15 +0000 (21:22 +0000)

Trivial merge