From: Takashi Iwai Date: Wed, 12 Aug 2009 06:05:20 +0000 (+0200) Subject: Merge branch 'fix/hda' into for-linus X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8884be98bcfa656febd24bd18fe8bececbf81251;p=linux-edison.git 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 --- 8884be98bcfa656febd24bd18fe8bececbf81251