Merge remote-tracking branch 'asoc/topic/x86' into asoc-next
authorMark Brown <[email protected]>
Mon, 17 Jun 2013 16:20:33 +0000 (17:20 +0100)
committerMark Brown <[email protected]>
Mon, 17 Jun 2013 16:20:33 +0000 (17:20 +0100)

Trivial merge