summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-06-02 12:12:57 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2005-06-02 12:12:57 -0500
commit7078253c085c037c070ca4e8bc9e9e7f18aa1e84 (patch)
treeeaf56c1a77b0de6ee82e23cee4433b2c4a47e67e /CREDITS
parent259692bd5a2b2c2d351dd90748ba4126bc2a21b9 (diff)
parent1e86d1c648508fd50e6c9960576b87906a7906ad (diff)
downloadop-kernel-dev-7078253c085c037c070ca4e8bc9e9e7f18aa1e84.zip
op-kernel-dev-7078253c085c037c070ca4e8bc9e9e7f18aa1e84.tar.gz
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS7
1 files changed, 3 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index c9068fe..9bd099d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -339,7 +339,7 @@ W: http://tomas.nocrew.org/
D: dsp56k device driver
N: Ross Biro
-E: bir7@leland.Stanford.Edu
+E: ross.biro@gmail.com
D: Original author of the Linux networking code
N: Anton Blanchard
@@ -882,13 +882,12 @@ S: Blacksburg, Virginia 24061
S: USA
N: Randy Dunlap
-E: rddunlap@osdl.org
+E: rdunlap@xenotime.net
W: http://www.xenotime.net/linux/linux.html
W: http://www.linux-usb.org
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
D: x86 SMP, ACPI, bootflag hacking
-S: 12725 SW Millikan Way, Suite 400
-S: Beaverton, Oregon 97005
+S: (ask for current address)
S: USA
N: Bob Dunlop
OpenPOWER on IntegriCloud