Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 25 Nov 2015 17:57:47 +0000 (17:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 25 Nov 2015 17:57:47 +0000 (17:57 +0000)

Trivial merge