Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <[email protected]>
Wed, 25 Nov 2015 17:57:47 +0000 (17:57 +0000)
committerMark Brown <[email protected]>
Wed, 25 Nov 2015 17:57:47 +0000 (17:57 +0000)

Trivial merge