projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc1156c 02a237b)
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)
commita68f20ef80e62b3dfed3097ad57ec88550cdabe7
treecf464bbaafb604ac1fe0cbc9605fcbd6255ba7b2tree | snapshot
parentfc1156c0b0f7ad45ec03d919866349eeca2bf18ccommit | diff
parent02a237b24d57e2e2d5402c92549e9e792aa24359commit | 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.
sound/pci/hda/patch_realtek.c diff1 | diff2 | blob | history
John Crispins staging tree