The following commit has been merged in the linux branch: commit fb66ebd88471cd2cc1205536dfc781b2f4c1d6b5 Merge: 29a4f2d31c03756bf24883e567a8c3b4ee5df1f4 491dc0437d4c56d11f78113eca3953cff87314f3 Author: Takashi Iwai tiwai@suse.de Date: Tue Oct 13 16:09:56 2009 +0200
Merge branch 'fix/hda' into for-linus
diff --combined Documentation/sound/alsa/HD-Audio-Models.txt index 75fddb4,4bf953b..4c7f9ae --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@@ -359,6 -359,7 +359,7 @@@ STAC9227/9228/9229/927 5stack-no-fp D965 5stack without front panel dell-3stack Dell Dimension E520 dell-bios Fixes with Dell BIOS setup + volknob Fixes with volume-knob widget 0x24 auto BIOS setup (default)
STAC92HD71B* @@@ -388,7 -389,7 +389,7 @@@ STAC92HD73 STAC92HD83* =========== ref Reference board - mic-ref Reference board with power managment for ports + mic-ref Reference board with power management for ports dell-s14 Dell laptop auto BIOS setup (default)