Merge branch 'linus' into core/generic-dma-coherent

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

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