Merge branch 'fix/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 28 May 2009 10:02:13 +0000 (12:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 28 May 2009 10:02:13 +0000 (12:02 +0200)
* fix/hda:
  ALSA: hda - Compaq Presario CQ60 patching for Conexant


Trivial merge