2.6.4-rc2

diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS   Wed Mar  3 22:17:24 2004
+++ b/MAINTAINERS   Wed Mar  3 22:17:24 2004
@@ -521,7 +521,7 @@
 P:   Dave Jones
 M:   davej@codemonkey.org.uk
 L:   cpufreq@www.linux.org.uk
-W:   http://www.codemonkey.org.uk/cpufreq/
+W:   http://www.codemonkey.org.uk/projects/cpufreq/
 S:   Maintained
 
 CPUID/MSR DRIVER
@@ -862,8 +862,8 @@
 S:   Maintained
 
 HFS FILESYSTEM
-P:   Oliver Neukum
-M:   oliver@neukum.org
+P:   Roman Zippel
+M:   zippel@linux-m68k.org
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
@@ -2395,7 +2395,7 @@
 
 ZR36067 VIDEO FOR LINUX DRIVER
 P:   Ronald Bultje
-M:   R.S.Bultje@pharm.uu.nl
+M:   rbultje@ronald.bitfreak.net
 L:   mjpeg-users@lists.sourceforge.net
 W:   http://mjpeg.sourceforge.net/driver-zoran/
 S:   Maintained