summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-06-18 12:14:56 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-06-18 12:14:56 +1000
commitcaa40669bd7ec9abea7a0448f44a8c11a7a1b88c (patch)
tree0f9d343e920c8e9b155cafa806b20b6e671dddb5 /Documentation
parent0cdddcfbf2cea5b86adfeb99fbb32897d82986d5 (diff)
parent58f35b3ae0f1c88117bf67320f52f80d4809d90b (diff)
Merge branch 'quilt/rr'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpu-hotplug.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index a99d7031cdf9..45d5a217484f 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -2,7 +2,7 @@
Maintainers:
CPU Hotplug Core:
- Rusty Russell <rusty@rustycorp.com.au>
+ Rusty Russell <rusty@rustcorp.com.au>
Srivatsa Vaddagiri <vatsa@in.ibm.com>
i386:
Zwane Mwaikambo <zwane@arm.linux.org.uk>