]> 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)
commit9a4bf1d1206a0108195d2fcb7ce563b2ceef65af
treecf464bbaafb604ac1fe0cbc9605fcbd6255ba7b2
parent46dbb104c0d6b9bbfc8247375d0492e693f77477
parenteecfead3e6fde1cf2668227d36c7a8a04f147ba1
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