Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:53 +0000 (11:37 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:53 +0000 (11:37 +0100)

Trivial merge