aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound/alsa/HD-Audio-Models.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-13 09:24:51 +0200
committerIngo Molnar <mingo@elte.hu>2009-10-13 09:24:59 +0200
commit2c96c142e941041973faab20ca3b82d57f435c5e (patch)
tree45188f0ecb3f4bb7408a7219f8fcd041d500235a /Documentation/sound/alsa/HD-Audio-Models.txt
parenttestmmiotrace.c: Add and use pr_fmt(fmt) (diff)
parenttracing/filters: Fix memory leak when setting a filter (diff)
downloadlinux-dev-2c96c142e941041973faab20ca3b82d57f435c5e.tar.xz
linux-dev-2c96c142e941041973faab20ca3b82d57f435c5e.zip
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue, we will queue up dependent patches. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/sound/alsa/HD-Audio-Models.txt')
-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 f1708b79f963..75fddb40f416 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -209,6 +209,7 @@ AD1884A / AD1883 / AD1984A / AD1984B
laptop laptop with HP jack sensing
mobile mobile devices with HP jack sensing
thinkpad Lenovo Thinkpad X300
+ touchsmart HP Touchsmart
AD1884
======