]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fix/acer-alc889-fix' into fix/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Feb 2012 14:34:31 +0000 (15:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Feb 2012 14:34:31 +0000 (15:34 +0100)
commit0b5b5f7c152ad60234db29e203d260aadbd5a11f
treecf464bbaafb604ac1fe0cbc9605fcbd6255ba7b2
parentfad9a212b0ac5652601a3753f1f168660244658c
parent1e090f5d3bac91d720f7a82faa1c87ae93e1a4f7
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.
sound/pci/hda/patch_realtek.c