Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <[email protected]>
Tue, 5 Jan 2016 23:07:32 +0000 (23:07 +0000)
committerMark Brown <[email protected]>
Tue, 5 Jan 2016 23:07:32 +0000 (23:07 +0000)

Trivial merge