diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-10 08:27:00 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-10 08:27:00 +0200 |
commit | 5431427b1a5acbae0b3dffd91f6ba96aee141f43 (patch) | |
tree | ddd1bdb5a2f634a953fab68a6318d86c46b088cd /Documentation | |
parent | a7a13d0676335a7dc9dd72264cca02606e43aaba (diff) | |
parent | 122661b67899980f1372812d907e73ebcfb3d037 (diff) | |
download | op-kernel-dev-5431427b1a5acbae0b3dffd91f6ba96aee141f43.zip op-kernel-dev-5431427b1a5acbae0b3dffd91f6ba96aee141f43.tar.gz |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 |
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 ce46fa1..37c6aad 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 |