diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
| commit | 9a9136e270af14da506f66bcafcc506b86a86498 (patch) | |
| tree | b4d0a6877d92635134b7a944d0032fbc43227fd2 /sound/oss/trident.c | |
| parent | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff) | |
| parent | 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
sound: convert "sound" subdirectory to UTF-8
MAINTAINERS: Add cxacru website/mailing list
include files: convert "include" subdirectory to UTF-8
general: convert "kernel" subdirectory to UTF-8
documentation: convert the Documentation directory to UTF-8
Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
remove broken URLs from net drivers' output
Magic number prefix consistency change to Documentation/magic-number.txt
trivial: s/i_sem /i_mutex/
fix file specification in comments
drivers/base/platform.c: fix small typo in doc
misc doc and kconfig typos
Remove obsolete fat_cvf help text
Fix occurrences of "the the "
Fix minor typoes in kernel/module.c
Kconfig: Remove reference to external mqueue library
Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
Correct comments in genrtc.c to refer to correct /proc file.
Fix more "deprecated" spellos.
Fix "deprecated" typoes.
...
Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'sound/oss/trident.c')
| -rw-r--r-- | sound/oss/trident.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index d98d311542ed..3bc1f6e9e4a3 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * Ollie Lho <ollie@sis.com.tw> SiS 7018 Audio Core Support | 18 | * Ollie Lho <ollie@sis.com.tw> SiS 7018 Audio Core Support |
| 19 | * Ching-Ling Lee <cling-li@ali.com.tw> ALi 5451 Audio Core Support | 19 | * Ching-Ling Lee <cling-li@ali.com.tw> ALi 5451 Audio Core Support |
| 20 | * Matt Wu <mattwu@acersoftech.com.cn> ALi 5451 Audio Core Support | 20 | * Matt Wu <mattwu@acersoftech.com.cn> ALi 5451 Audio Core Support |
| 21 | * Peter Wächtler <pwaechtler@loewe-komp.de> CyberPro5050 support | 21 | * Peter Wächtler <pwaechtler@loewe-komp.de> CyberPro5050 support |
| 22 | * Muli Ben-Yehuda <mulix@mulix.org> | 22 | * Muli Ben-Yehuda <mulix@mulix.org> |
| 23 | * | 23 | * |
| 24 | * | 24 | * |
| @@ -89,7 +89,7 @@ | |||
| 89 | * use set_current_state, properly release resources on failure in | 89 | * use set_current_state, properly release resources on failure in |
| 90 | * trident_probe, get rid of check_region | 90 | * trident_probe, get rid of check_region |
| 91 | * v0.14.9c | 91 | * v0.14.9c |
| 92 | * August 10 2001 Peter Wächtler <pwaechtler@loewe-komp.de> | 92 | * August 10 2001 Peter Wächtler <pwaechtler@loewe-komp.de> |
| 93 | * added support for Tvia (formerly Integraphics/IGST) CyberPro5050 | 93 | * added support for Tvia (formerly Integraphics/IGST) CyberPro5050 |
| 94 | * this chip is often found in settop boxes (combined video+audio) | 94 | * this chip is often found in settop boxes (combined video+audio) |
| 95 | * v0.14.9b | 95 | * v0.14.9b |