summaryrefslogtreecommitdiffstats
path: root/include/linux/net.h
diff options
context:
space:
mode:
authorAnton Altaparmakov2005-05-21 23:00:02 +0200
committerAnton Altaparmakov2005-05-21 23:00:02 +0200
commit67394f8f069c2fdf90f3b6d851824c07815442af (patch)
tree0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /include/linux/net.h
parentMerge with /usr/src/ntfs-2.6.git (diff)
parentAutomatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git (diff)
downloadkernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.gz
kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.xz
kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.zip
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'include/linux/net.h')
-rw-r--r--include/linux/net.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h
index e5914c1f0c4d..6d997ff3f103 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -7,7 +7,7 @@
* Version: @(#)net.h 1.0.3 05/25/93
*
* Authors: Orest Zborowski, <obz@Kodak.COM>
- * Ross Biro, <bir7@leland.Stanford.Edu>
+ * Ross Biro
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
*
* This program is free software; you can redistribute it and/or