diff --git a/[refs] b/[refs]
index 97f82809c1fe..72d870e17f95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b4650e55e06d2cc05115767551cd3ace875431
+refs/heads/master: 612de10db06c0704a66bbe7fd13990cb1c2cb958
diff --git a/trunk/drivers/parport/ieee1284.c b/trunk/drivers/parport/ieee1284.c
index e97059415ab4..ac2a805ac7ea 100644
--- a/trunk/drivers/parport/ieee1284.c
+++ b/trunk/drivers/parport/ieee1284.c
@@ -1,4 +1,4 @@
-/* $Id: parport_ieee1284.c,v 1.4 1997/10/19 21:37:21 philip Exp $
+/*
  * IEEE-1284 implementation for parport.
  *
  * Authors: Phil Blundell <philb@gnu.org>
diff --git a/trunk/drivers/parport/probe.c b/trunk/drivers/parport/probe.c
index cd565bb4e1a9..0f6550719bcf 100644
--- a/trunk/drivers/parport/probe.c
+++ b/trunk/drivers/parport/probe.c
@@ -1,4 +1,4 @@
-/* $Id: parport_probe.c,v 1.1 1999/07/03 08:56:17 davem Exp $
+/*
  * Parallel port device probing code
  *
  * Authors:    Carsten Gross, carsten@sol.wohnheim.uni-ulm.de
diff --git a/trunk/drivers/parport/share.c b/trunk/drivers/parport/share.c
index a8a62bbbb576..0ebca450ed29 100644
--- a/trunk/drivers/parport/share.c
+++ b/trunk/drivers/parport/share.c
@@ -1,4 +1,4 @@
-/* $Id: parport_share.c,v 1.15 1998/01/11 12:06:17 philip Exp $
+/*
  * Parallel-port resource manager code.
  * 
  * Authors: David Campbell <campbell@tirian.che.curtin.edu.au>
diff --git a/trunk/include/linux/parport.h b/trunk/include/linux/parport.h
index 6a0d7cdb5774..e1f83c5065c5 100644
--- a/trunk/include/linux/parport.h
+++ b/trunk/include/linux/parport.h
@@ -1,5 +1,3 @@
-/* $Id: parport.h,v 1.1 1998/05/17 10:57:52 andrea Exp andrea $ */
-
 /*
  * Any part of this program may be used in documents licensed under
  * the GNU Free Documentation License, Version 1.1 or any later version