diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/media/video/cx18/cx18-alsa-pcm.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/media/video/cx18/cx18-alsa-pcm.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-alsa-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c index 2bd312daeb1..8f55692db36 100644 --- a/drivers/media/video/cx18/cx18-alsa-pcm.c +++ b/drivers/media/video/cx18/cx18-alsa-pcm.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * ALSA PCM device for the | 2 | * ALSA PCM device for the |
| 3 | * ALSA interface to cx18 PCM capture streams | 3 | * ALSA interface to cx18 PCM capture streams |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2009 Andy Walls <awalls@radix.net> | 5 | * Copyright (C) 2009 Andy Walls <awalls@md.metrocast.net> |
| 6 | * Copyright (C) 2009 Devin Heitmueller <dheitmueller@kernellabs.com> | 6 | * Copyright (C) 2009 Devin Heitmueller <dheitmueller@kernellabs.com> |
| 7 | * | 7 | * |
| 8 | * Portions of this work were sponsored by ONELAN Limited. | 8 | * Portions of this work were sponsored by ONELAN Limited. |