Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus