diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-01-31 12:04:50 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-31 12:04:50 +0100 |
commit | 6abb31908f3ed7d38e93d06b704c9342029ca9a0 (patch) | |
tree | 4ba084ebd5865d7c81e1f2003f7941003adb4d65 /Documentation | |
parent | efbeb0718126d277c9d7e902eec8da956acf4bd6 (diff) | |
parent | 195938753951e70e85303301c37906c7ad72645e (diff) | |
download | op-kernel-dev-6abb31908f3ed7d38e93d06b704c9342029ca9a0.zip op-kernel-dev-6abb31908f3ed7d38e93d06b704c9342029ca9a0.tar.gz |
Merge branch 'topic/hda' into fix/hda
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 16ae430..0caf77e 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -296,6 +296,7 @@ Conexant 5066 ============= laptop Basic Laptop config (default) hp-laptop HP laptops, e g G60 + asus Asus K52JU, Lenovo G560 dell-laptop Dell laptops dell-vostro Dell Vostro olpc-xo-1_5 OLPC XO 1.5 |