Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next

This commit is contained in:
Mark Brown 2014-03-13 14:19:47 +00:00
commit 1727428de8