Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 21:01:04 +0000 (22:01 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 21:01:04 +0000 (22:01 +0100)

Trivial merge