summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-27 09:40:40 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-27 09:40:40 -0700
commit371858568e02698fe2de8ba4bf771e3f40db69e5 (patch)
tree07ec799d7babae7eafda93d9dfd9d11fccff086f /MAINTAINERS
parente82b0f2cc21be905e504573483fa9542b15df96f (diff)
parent54f4ee183aea859eb09f141dad3fc3c6f4fe0446 (diff)
downloadlinux-stable-371858568e02698fe2de8ba4bf771e3f40db69e5.tar.gz
linux-stable-371858568e02698fe2de8ba4bf771e3f40db69e5.tar.bz2
linux-stable-371858568e02698fe2de8ba4bf771e3f40db69e5.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: fix RTC/NVRAM accesses on Maple [PATCH] ppc32 CPM_UART: various fixes for pq2 uart users [PATCH] powerpc: linuxppc64.org no more
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 92d696874965..74d71cafb17c 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
@@ -1716,7 +1716,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