Merge branches 'topic/asoc' and 'topic/hda' into for-linus