Merge remote-tracking branch 'asoc/topic/sti' into asoc-next
authorMark Brown <[email protected]>
Fri, 27 May 2016 12:45:55 +0000 (13:45 +0100)
committerMark Brown <[email protected]>
Fri, 27 May 2016 12:45:55 +0000 (13:45 +0100)

Trivial merge