diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 13:12:57 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 13:12:57 -0400 |
| commit | 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 (patch) | |
| tree | eaf56c1a77b0de6ee82e23cee4433b2c4a47e67e /net/socket.c | |
| parent | 259692bd5a2b2c2d351dd90748ba4126bc2a21b9 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 2cd44990d8d3..cec0cb38b9ce 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Version: @(#)socket.c 1.1.93 18/02/95 | 4 | * Version: @(#)socket.c 1.1.93 18/02/95 |
| 5 | * | 5 | * |
| 6 | * Authors: Orest Zborowski, <obz@Kodak.COM> | 6 | * Authors: Orest Zborowski, <obz@Kodak.COM> |
| 7 | * Ross Biro, <bir7@leland.Stanford.Edu> | 7 | * Ross Biro |
| 8 | * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> | 8 | * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> |
| 9 | * | 9 | * |
| 10 | * Fixes: | 10 | * Fixes: |