Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / if_arp.h

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index bbf49bcd77053db6100ea5609baf7d4f7b9ee32b..0856548a2a08b2eadab1b6e9de56dfc667993673 100644 (file)
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -9,7 +9,7 @@
  *
  * Authors:    Original taken from Berkeley UNIX 4.3, (c) UCB 1986-1988
  *             Portions taken from the KA9Q/NOS (v2.00m PA0GRI) source.
- *             Ross Biro, <bir7@leland.Stanford.Edu>
+ *             Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *             Florian La Roche,
  *             Jonathan Layes <layes@loran.com>