summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-08-29 03:39:52 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-08-29 03:39:52 -0700
commit508d87281dcc61bfd51353a632f8f4aadbc9452a (patch)
tree0916d302f35ee9d48c11c44a98d0c041719a9df2 /include/linux
parent8afa2c8f724e8ffd60ae0a4233f92141082b3119 (diff)
parent82b301e3acfcd4ba818da09fdfe0daf3498c638a (diff)
Merge master.kernel.org:/home/davem/BK/sctp-rename-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sctp.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index b070fc1220e5..77502f62b660 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -8,8 +8,6 @@
*
* This file is part of the SCTP kernel reference Implementation
*
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/linux/sctp.h,v 1.7 2002/07/17 16:13:50 jgrimm Exp $
- *
* Various protocol defined structures.
*
* The SCTP reference implementation is free software;