Merge bk://kernel.bkbits.net/davem/net-2.5

into penguin.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://kernel.bkbits.net/davem/net-2.5
into penguin.transmeta.com:/home/torvalds/v2.5/linux
6bd4301a · Linus Torvalds · 89e0ffb5 · 7c97c222 · 6bd4301a
Commit 6bd4301a authored May 06, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CREDITS CREDITS +2 -2

No files found.
--- a/CREDITS
+++ b/CREDITS
@@ -3027,8 +3027,8 @@ E: torvalds@transmeta.com
 W: http://www.cs.helsinki.fi/Linus.Torvalds
 P: 1024/A86B35C5 96 54 50 29 EC 11 44 7A  BE 67 3C 24 03 13 62 C8
 D: Original kernel hacker
-S: 1050 Woodduck Avenue
-S: Santa Clara, California 95051
+S: 3990 Freedom Circle
+S: Santa Clara, California 95054
 S: USA

 N: Marcelo W. Tosatti