diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
| commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
| tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /drivers/media/video/cx23885/cx23885-417.c | |
| parent | 1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-417.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-417.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index 8118091568fc..7b0e8c01692e 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * (c) 2004 Jelle Foks <jelle@foks.8m.com> | 5 | * (c) 2004 Jelle Foks <jelle@foks.8m.com> |
| 6 | * (c) 2004 Gerd Knorr <kraxel@bytesex.org> | 6 | * (c) 2004 Gerd Knorr <kraxel@bytesex.org> |
| 7 | * (c) 2008 Steven Toth <stoth@hauppauge.com> | 7 | * (c) 2008 Steven Toth <stoth@linuxtv.org> |
| 8 | * - CX23885/7/8 support | 8 | * - CX23885/7/8 support |
| 9 | * | 9 | * |
| 10 | * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), | 10 | * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), |