Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 3 Dec 2013 18:08:59 +0000 (18:08 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 3 Dec 2013 18:08:59 +0000 (18:08 +0000)

Trivial merge