projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v3.13-rc2 into staging-next
[cascardo/linux.git]
/
Documentation
/
cpu-hotplug.txt
diff --git
a/Documentation/cpu-hotplug.txt
b/Documentation/cpu-hotplug.txt
index
786dc82
..
8cb9938
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:
Rusty Russell <rusty@rustcorp.com.au>
Srivatsa Vaddagiri <vatsa@in.ibm.com>
i386:
- Zwane Mwaikambo <zwane
@arm.linux.org.uk
>
+ Zwane Mwaikambo <zwane
m@gmail.com
>
ppc64:
Nathan Lynch <nathanl@austin.ibm.com>
Joel Schopp <jschopp@austin.ibm.com>
ppc64:
Nathan Lynch <nathanl@austin.ibm.com>
Joel Schopp <jschopp@austin.ibm.com>