Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:52:32 +0000 (12:52 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:52:32 +0000 (12:52 +0100)

Trivial merge