diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 20:45:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 20:45:42 -0500 |
| commit | fe10e6f4b24ef8ca12cb4d2368deb4861ab1861b (patch) | |
| tree | 86f524927ce64b07b3ab18254558e7fa766b0688 /Documentation | |
| parent | f28ad3b44a03892b533cfb503273370033594d9d (diff) | |
| parent | d938e66003c9ccc6c0ab10fa31ee23cf27574d66 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
ALSA: hda - Re-enable the check NO_PRESENCE misc bit
ALSA: vmaster - Free slave-links when freeing the master element
ALSA: hda - Don't add elements of other codecs to vmaster slave
ALSA: intel8x0: improve virtual environment detection
ALSA: intel8x0: move virtual environment detection code into one place
ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384
ALSA: hda - fix internal mic on Dell Vostro 3500 laptop
ALSA: HDA: Remove quirk for Toshiba T110
ALSA: usb-audio - Fix the missing volume quirks at delayed init
ALSA: hda - Mute unused capture sources for Realtek codecs
ALSA: intel8x0: Improve comments for VM optimization
ASoC: Ensure we get an impedence reported for WM8958 jack detect
ASoC: Don't use wm8994->control_data when requesting IRQs
ASoC: Don't use wm8994->control_data in wm8994_readable_register()
ASoC: Update git repository URL
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 4f3443230d89..edad99abec21 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -349,6 +349,7 @@ STAC92HD83* | |||
| 349 | ref Reference board | 349 | ref Reference board |
| 350 | mic-ref Reference board with power management for ports | 350 | mic-ref Reference board with power management for ports |
| 351 | dell-s14 Dell laptop | 351 | dell-s14 Dell laptop |
| 352 | dell-vostro-3500 Dell Vostro 3500 laptop | ||
| 352 | hp HP laptops with (inverted) mute-LED | 353 | hp HP laptops with (inverted) mute-LED |
| 353 | hp-dv7-4000 HP dv-7 4000 | 354 | hp-dv7-4000 HP dv-7 4000 |
| 354 | auto BIOS setup (default) | 355 | auto BIOS setup (default) |