diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 13:02:45 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 13:02:45 +0400 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | linux-e27772b48df91a954a74b1411b57d83b945a58c7.tar.xz | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h index 54b2844e7a71..66abf77f51fd 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h @@ -1,6 +1,5 @@ /* * - * $Id$ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> |