Skip to content
Commit a68f20ef authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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.
parents fc1156c0 02a237b2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment