Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
authorMark Brown <[email protected]>
Sun, 30 Aug 2015 14:52:08 +0000 (15:52 +0100)
committerMark Brown <[email protected]>
Sun, 30 Aug 2015 14:52:08 +0000 (15:52 +0100)

Trivial merge