Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 26 Apr 2016 18:25:13 +0000 (19:25 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 26 Apr 2016 18:25:13 +0000 (19:25 +0100)

Trivial merge