merge by hand (qla_os.c mismerge)

[cascardo/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 2cd4499..cec0cb3 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -4,7 +4,7 @@
  * Version:    @(#)socket.c    1.1.93  18/02/95
  *
  * Authors:    Orest Zborowski, <obz@Kodak.COM>
- *             Ross Biro, <bir7@leland.Stanford.Edu>
+ *             Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *
  * Fixes: