Merge branch 'topic/asoc' into for-linus