Merge branch 'fix/hda' into for-linus