Merge branch 'topic/hda-reconfig' into topic/hda-next