Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <[email protected]>
Wed, 8 Oct 2014 15:44:49 +0000 (16:44 +0100)
committerMark Brown <[email protected]>
Wed, 8 Oct 2014 15:44:49 +0000 (16:44 +0100)

Trivial merge