aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-07-09 00:59:50 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-07-09 00:59:50 -0700
commit69766ad7f5f7e8f58089edc0ad9177ad9c2da96a (patch)
tree3120a7a1fb86eece271873a9354918a6f46025eb /CREDITS
parent01d1df33e46bfe8546526e22e5aebe5b64363a35 (diff)
downloadhistory-69766ad7f5f7e8f58089edc0ad9177ad9c2da96a.tar.gz
Update CREDITS file and other documentation about my new email address.
Also, switch the snail-mail address to OSDL from Transmeta. I'm sure they'll enjoy the junk-mail ;)
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS8
1 files changed, 3 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 8a0034c18d5cff..81f244e5ab8f1e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3046,12 +3046,10 @@ S: Sevilla 41005
S: Spain
N: Linus Torvalds
-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
+E: torvalds@osdl.org
D: Original kernel hacker
-S: 3990 Freedom Circle
-S: Santa Clara, California 95054
+S: 12725 SW Millikan Way, Suite 400
+S: Beaverton, Oregon 97005
S: USA
N: Marcelo W. Tosatti