Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:42 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:42 +0000 (00:23 +0100)

Trivial merge