Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[linux-drm-fsl-dcu.git] / Documentation / cpu-hotplug.txt

diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index 786dc82f98ce4833c0ec8b1ecbcf8ad2a8f29ddf..8cb9938cc47e8c0e3d0202786bd9c434f96cbd4d 100644 (file)
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -5,7 +5,7 @@
                        Rusty Russell <rusty@rustcorp.com.au>
                        Srivatsa Vaddagiri <vatsa@in.ibm.com>
                i386:
-                       Zwane Mwaikambo <zwane@arm.linux.org.uk>
+                       Zwane Mwaikambo <zwanem@gmail.com>
                ppc64:
                        Nathan Lynch <nathanl@austin.ibm.com>
                        Joel Schopp <jschopp@austin.ibm.com>