| commit | a68f20ef80e62b3dfed3097ad57ec88550cdabe7 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Feb 13 15:34:31 2012 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Feb 13 15:34:31 2012 +0100 |
| tree | cf464bbaafb604ac1fe0cbc9605fcbd6255ba7b2 | |
| parent | fc1156c0b0f7ad45ec03d919866349eeca2bf18c [diff] | |
| parent | 02a237b24d57e2e2d5402c92549e9e792aa24359 [diff] |
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.