aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-10 07:23:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-10 07:23:45 -0700
commit3657423c02b639fcade37673f8541bd90c5e58e5 (patch)
tree748e7f7114c9014b3bee138519872ac978f7320a /Documentation
parentdf423dc7f2a801b9a45d7c501a8eb5c529455ea1 (diff)
parent5431427b1a5acbae0b3dffd91f6ba96aee141f43 (diff)
downloadmrst-s0i3-test-3657423c02b639fcade37673f8541bd90c5e58e5.tar.gz
mrst-s0i3-test-3657423c02b639fcade37673f8541bd90c5e58e5.tar.xz
mrst-s0i3-test-3657423c02b639fcade37673f8541bd90c5e58e5.zip
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: rawmidi: fix the get next midi device ioctl ALSA: hda - Fix wrong HP pin detection in snd_hda_parse_pin_def_config() ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open() ALSA: msnd-classic: Fix invalid cfg parameter ALSA: hda - Enable PC-beep for EeePC with ALC269 codec ALSA: hda - Add errata initverb sequence for CS42xx codecs ALSA: usb - Release capture substream URBs properly ALSA: virtuoso: fix setting of Xonar DS line-in/mic-in controls ALSA: virtuoso: work around missing reset in the Xonar DS Windows driver ALSA: hda - Add quirk for Lenovo T400s ALSA: usb-audio: fix detection of vendor-specific device protocol settings ALSA: usb-audio: Assume first control interface is for audio ALSA: hda - Add a new hp-laptop model for Conexant 5066, tested on HP G60
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt1
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 ce46fa1e643..37c6aad5e59 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -296,6 +296,7 @@ Conexant 5051
Conexant 5066
=============
laptop Basic Laptop config (default)
+ hp-laptop HP laptops, e g G60
dell-laptop Dell laptops
dell-vostro Dell Vostro
olpc-xo-1_5 OLPC XO 1.5