From: Takashi Iwai Date: Mon, 13 Feb 2012 14:34:31 +0000 (+0100) Subject: Merge branch 'fix/acer-alc889-fix' into fix/hda X-Git-Tag: v3.3-rc4~22^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68f20ef80e62b3dfed3097ad57ec88550cdabe7;p=pandora-kernel.git Merge branch 'fix/acer-alc889-fix' into fix/hda Conflicts: sound/pci/hda/patch_realtek.c Merged back the fix for Acer Aspire 6935 with ALC889 codec. The fix commit was based on 3.2 kernel so that it can be applied to stable kernel cleanly. --- a68f20ef80e62b3dfed3097ad57ec88550cdabe7 Reading git-diff-tree failed