summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-19 04:14:39 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-08-19 04:14:39 +0200
commita3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch)
tree6bbc2806756924105802f4584157396fb98d282c /CREDITS
parent[PATCH] skge: turn on link status LED (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
downloadlinux-a3bc068022b968a3042b48eb9a8e8b0418fb9cdd.tar.xz
linux-a3bc068022b968a3042b48eb9a8e8b0418fb9cdd.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS3
1 files changed, 1 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 50121d432b62..f553f8cfaa62 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
S: Canada
N: Zwane Mwaikambo
-E: zwane@linuxpower.ca
-W: http://function.linuxpower.ca
+E: zwane@arm.linux.org.uk
D: Various driver hacking
D: Lowlevel x86 kernel hacking
D: General debugging