summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-28 16:35:13 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-28 16:35:13 -0400
commitb53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch)
treee912dbe14b6af76b0ebe853a9976c99616bb8a4c /MAINTAINERS
parent983f27d37d4fc72c252835cb2ee3103b360735a6 (diff)
parent83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b (diff)
downloadlinux-b53471711f21ba0e151075f0e1d6d531eb50f1b1.tar.bz2
Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 31c23e3a2de9..8e88ff9c49ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -565,7 +565,7 @@ BROADBAND PROCESSOR ARCHITECTURE
P: Arnd Bergmann
M: arnd@arndb.de
L: linuxppc-dev@ozlabs.org
-W: http://linuxppc64.org
+W: http://www.penguinppc.org/ppc64/
S: Supported
BTTV VIDEO4LINUX DRIVER
@@ -1722,7 +1722,7 @@ M: paulus@au.ibm.com
P: Anton Blanchard
M: anton@samba.org
M: anton@au.ibm.com
-W: http://linuxppc64.org
+W: http://www.penguinppc.org/ppc64/
L: linuxppc-dev@ozlabs.org
S: Supported