Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:28 +0000 (12:51 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:28 +0000 (12:51 +0100)

Trivial merge