git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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.


Trivial merge
Pandora Kernel Repository