Merge branch 'fix/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Aug 2009 06:05:20 +0000 (08:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Aug 2009 06:05:20 +0000 (08:05 +0200)
commit8884be98bcfa656febd24bd18fe8bececbf81251
tree6e31f5e26df6557d6023ac562c6ab36220a6d857
parent909a2607a5c923bf40a07ab0bfaa78bee775bf55
parentdd704698f56c1451fc9c5daadcd6e3a089de2c40
Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Don't override ADC definitions for ALC codecs
  ALSA: hda - Add missing vmaster initialization for ALC269