2.6.24-rc4-git5

diff --git a/MAINTAINERS b/MAINTAINERS
index 2bbe40e..f3d7256 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1681,8 +1681,7 @@ S:   Maintained
 HARMONY SOUND DRIVER
 P:   Kyle McMartin
 M:   kyle@parisc-linux.org
-W:   http://www.parisc-linux.org/~kyle/harmony/
-L:   parisc-linux@lists.parisc-linux.org
+L:   linux-parisc@vger.kernel.org
 S:   Maintained
 
 HAYES ESP SERIAL DRIVER
@@ -2598,13 +2597,6 @@ L:   https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:   http://0pointer.de/lennart/tchibo.html
 S:   Maintained
 
-MTRR AND SIMILAR SUPPORT [i386]
-P:   Richard Gooch
-M:   rgooch@atnf.csiro.au
-L:   linux-kernel@vger.kernel.org
-W:   http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
-S:   Maintained
-
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:   Pierre Ossman
 M:   drzeus-mmc@drzeus.cx
@@ -2897,16 +2889,15 @@ W:   http://www.torque.net/linux-pp.html
 S:   Maintained
 
 PARISC ARCHITECTURE
+P:   Kyle McMartin
+M:   kyle@parisc-linux.org
 P:   Matthew Wilcox
 M:   matthew@wil.cx
 P:   Grant Grundler
 M:   grundler@parisc-linux.org
-P:   Kyle McMartin
-M:   kyle@parisc-linux.org
-L:   parisc-linux@parisc-linux.org
+L:   linux-parisc@vger.kernel.org
 W:   http://www.parisc-linux.org/
 T:   git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
-T:   cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:   Maintained
 
 PARAVIRT_OPS INTERFACE