diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-10-04 10:58:18 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-10-04 10:58:18 +0200 |
| commit | f91ad1217aebdf4cc7b536180ed3528952b47c8d (patch) | |
| tree | 3882b4d8a4d68aeac87f4f676e08ff3e1d5b985f /Documentation | |
| parent | 827efacf9b499b55bebef8112a18333ad0a6ed91 (diff) | |
| parent | 1c7eb28096b50831697a9cf6f8bf1af0e5b234bc (diff) | |
Merge branch 'linux-3.4.y' into tilt-3.4_04Oct_rebase
Conflicts:
drivers/rtc/rtc-twl.c
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 286ec04d1383..82dd174396d1 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -47,6 +47,7 @@ ALC882/883/885/888/889 acer-aspire-4930g Acer Aspire 4930G/5930G/6530G/6930G/7730G acer-aspire-8930g Acer Aspire 8330G/6935G acer-aspire Acer Aspire others + no-primary-hp VAIO Z workaround (for fixed speaker DAC) ALC861/660 ========== |