diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /drivers/media/video/cx18/cx18-alsa-main.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/media/video/cx18/cx18-alsa-main.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-alsa-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c index b5d7cbf4528a..d50d69da387b 100644 --- a/drivers/media/video/cx18/cx18-alsa-main.c +++ b/drivers/media/video/cx18/cx18-alsa-main.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ALSA interface to cx18 PCM capture streams | 2 | * ALSA interface to cx18 PCM capture streams |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2009 Andy Walls <awalls@radix.net> | 4 | * Copyright (C) 2009 Andy Walls <awalls@md.metrocast.net> |
| 5 | * Copyright (C) 2009 Devin Heitmueller <dheitmueller@kernellabs.com> | 5 | * Copyright (C) 2009 Devin Heitmueller <dheitmueller@kernellabs.com> |
| 6 | * | 6 | * |
| 7 | * Portions of this work were sponsored by ONELAN Limited. | 7 | * Portions of this work were sponsored by ONELAN Limited. |