Merge branch 'core/futexes' into core/core

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-std.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c
index fdc5a2b49ca8568cf73adb1b3f5fe6d69859a814..ca9f83a85ca50c0f3f04e721f8e71d6a7739e669 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *