summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-10-28 16:59:58 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-10-28 16:59:58 -0800
commit117dbfb1902a24f941ca4721b4f1769b5c3a3bc9 (patch)
tree5765fda0701e063a26da34a57556566c4ad696f2 /include/linux
parent8efc48a4c5200ddd33bf6412ed200ba0cb82ac97 (diff)
parent802f1a4ebd777bf5b26d3af1b30c30f29aa2c104 (diff)
Merge http://gkernel.bkbits.net/misc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ethtool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 6165f292f5ac..e672ac588767 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -2,7 +2,7 @@
* ethtool.h: Defines for Linux ethtool.
*
* Copyright (C) 1998 David S. Miller (davem@redhat.com)
- * Copyright 2001 Jeff Garzik <jgarzik@mandrakesoft.com>
+ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
* Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
* Portions Copyright 2002 Intel (eli.kupermann@intel.com,
* christopher.leech@intel.com,