path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-23 10:01:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-23 10:01:20 -0800
commit6f40334694dce047d43c6f2cce255b596da6de50 (patch)
treebc68ea85f04d4319fd781d6f5e14bb03c41dd52a /Documentation
parent9c717de946ed7f5782e6dffacf2d05859073058c (diff)
parent54a26089a2733df2765342acaaf71466d37ff5a5 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Add STAC9205 PCI_QUIRK for Dell Vostro 1700 ASoC: Do not write to invalid registers on the wm9712. ALSA: hda - Set mixer name after codec patch ASoC: add missing parameter to mx27vis_hifi_hw_free() ASoC: sh: FSI:: don't check platform_get_irq's return value against zero ALSA: sound/core/pcm_timer.c: use lib/gcd.c ALSA: hda - Add MSI blacklist ALSA: hda - Add support for the new 27 inch IMacs ALSA: hda - Fix NULL dereference with enable_beep=0 option
Diffstat (limited to 'Documentation')
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index e93affff3af8..e72cee9e2a71 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -403,4 +403,5 @@ STAC9872
Cirrus Logic CS4206/4207
mbp55 MacBook Pro 5,5
+ imac27 IMac 27 Inch
auto BIOS setup (default)

Privacy Policy