diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /drivers/media/video/cx18/cx18-alsa-main.c | |
| parent | 482e6f8466ab1066f1a969bcdbe916b56439622c (diff) | |
| parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff) | |
Merge branch 'master' 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. |