diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 12:02:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 12:02:42 -0800 |
| commit | 585a7c666e67b7a6757bd12b734e22f4f76998a2 (patch) | |
| tree | 24d3672fb7e67c62755fd1786847a28b4f3ceb8d /Documentation | |
| parent | 44f2c5c841da1b1e0864d768197ab1497b5c2cc1 (diff) | |
| parent | 00e6a31984cd1adaa7cbb8bb7603e3241b26ef55 (diff) | |
| download | op-kernel-dev-585a7c666e67b7a6757bd12b734e22f4f76998a2.zip op-kernel-dev-585a7c666e67b7a6757bd12b734e22f4f76998a2.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: use linux/io.h to fix compile warnings
ALSA: hda - Fix memory leaks in conexant jack arrays
ASoC: CX20442: fix NULL pointer dereference
ASoC: Amstrad Delta: fix const related build error
ALSA: oxygen: fix output routing on Xonar DG
sound: silent echo'ed messages in Makefile
ASoC: Fix mask/val_mask confusion snd_soc_dapm_put_volsw()
ASoC: DaVinci: fix kernel panic due to uninitialized platform_data
ALSA: HDA: Fix microphone(s) on Lenovo Edge 13
ASoC: Fix module refcount for auxiliary devices
ALSA: HDA: cxt5066 - Use asus model for Asus U50F, select correct SPDIF output
ALSA: HDA: Add a new model "asus" for Conexant 5066/205xx
ALSA: HDA: Refactor some redundant code for Conexant 5066/205xx
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 |
