diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-02-13 15:34:31 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-02-13 15:34:31 +0100 |
commit | a68f20ef80e62b3dfed3097ad57ec88550cdabe7 (patch) | |
tree | cf464bbaafb604ac1fe0cbc9605fcbd6255ba7b2 /sound/i2c/tea6330t.c | |
parent | ALSA: hda - Fix initialization of secondary capture source on VT1705 (diff) | |
parent | ALSA: hda - Fix silent speaker output on Acer Aspire 6935 (diff) | |
download | linux-a68f20ef80e62b3dfed3097ad57ec88550cdabe7.tar.xz linux-a68f20ef80e62b3dfed3097ad57ec88550cdabe7.zip |
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.
Diffstat (limited to 'sound/i2c/tea6330t.c')
0 files changed, 0 insertions, 0 deletions