* Merged HEAD

*   "clobbered" (as Phil would say) kernel_patches/patches

diff --git a/lnet/include/cygwin-ioctl.h b/lnet/include/cygwin-ioctl.h
index 60db8b6..8a33957 100644 (file)
--- a/lnet/include/cygwin-ioctl.h
+++ b/lnet/include/cygwin-ioctl.h
@@ -1,5 +1,4 @@
-/* $Id: cygwin-ioctl.h,v 1.1.2.1 2003/08/19 12:08:49 ericm Exp $
- *
+/*
  * linux/ioctl.h for Linux by H.H. Bergman.
  */
 

diff --git a/lustre/portals/include/cygwin-ioctl.h b/lustre/portals/include/cygwin-ioctl.h
index 60db8b6..8a33957 100644 (file)
--- a/lustre/portals/include/cygwin-ioctl.h
+++ b/lustre/portals/include/cygwin-ioctl.h
@@ -1,5 +1,4 @@
-/* $Id: cygwin-ioctl.h,v 1.1.2.1 2003/08/19 12:08:49 ericm Exp $
- *
+/*
  * linux/ioctl.h for Linux by H.H. Bergman.
  */