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)
* fix/hda:
  ALSA: hda - Don't override ADC definitions for ALC codecs
  ALSA: hda - Add missing vmaster initialization for ALC269


Trivial merge