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

This commit is contained in:
Mark Brown 2013-08-22 14:28:48 +01:00
commit 3f151cbf76