From: eeb <eeb>
Date: Thu, 4 Dec 2003 11:06:55 +0000 (+0000)
Subject: *   Merged HEAD
X-Git-Tag: v1_7_0_51~2^7~156
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ddf9d6b0c1f33a4ce91bc8ab5ee24c59997b5302;p=fs%2Flustre-release.git

*   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
--- 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
--- 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.
  */