diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 06:55:14 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 06:55:14 +0200 |
commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /drivers/media/video/pvrusb2/pvrusb2-tuner.c | |
parent | Input: add switch for dock events (diff) | |
parent | Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux (diff) | |
download | linux-908cf4b925e419bc74f3297b2f0e51d6f8a81da2.tar.xz linux-908cf4b925e419bc74f3297b2f0e51d6f8a81da2.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-tuner.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-tuner.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c index 05e65ce2e3a9..07775d1aad4e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c +++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c @@ -1,6 +1,5 @@ /* * - * $Id$ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> |