Merge branch 'fix/hda' of git://github.com/tiwai/sound