Merge branch 'fix/hda' into for-linus
Takashi Iwai authored
* fix/hda:
  ALSA: hda - Compaq Presario CQ60 patching for Conexant
817682c1