Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 31 Jul 2013 20:07:23 +0000 (21:07 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 31 Jul 2013 20:07:23 +0000 (21:07 +0100)

Trivial merge