Merge branch 'core/futexes' into core/core

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-debugifc.h

diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h b/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
index 990b02d35d36903090b5e1b34725e47f036f1605..e24ff59f8605d50501ca8e5e5a5976e9840ab675 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *