diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 15:06:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 15:06:21 -0400 |
| commit | 3d58f48ba05caed9118bce62b3047f8683438835 (patch) | |
| tree | 94c911034f0e14ded73d3e9e6e9f8e22b6cad822 /Documentation/sound/alsa/HD-Audio-Models.txt | |
| parent | abfe0af9813153bae8c85d9bac966bafcb8ddab1 (diff) | |
| parent | d9244b5d2fbfe9fa540024b410047af13ceec90f (diff) | |
Merge branch 'linus' into irq/numa
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
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.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 8eec05bc079e..322869fc8a9e 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -334,6 +334,7 @@ STAC9227/9228/9229/927x | |||
| 334 | ref-no-jd Reference board without HP/Mic jack detection | 334 | ref-no-jd Reference board without HP/Mic jack detection |
| 335 | 3stack D965 3stack | 335 | 3stack D965 3stack |
| 336 | 5stack D965 5stack + SPDIF | 336 | 5stack D965 5stack + SPDIF |
| 337 | 5stack-no-fp D965 5stack without front panel | ||
| 337 | dell-3stack Dell Dimension E520 | 338 | dell-3stack Dell Dimension E520 |
| 338 | dell-bios Fixes with Dell BIOS setup | 339 | dell-bios Fixes with Dell BIOS setup |
| 339 | auto BIOS setup (default) | 340 | auto BIOS setup (default) |