aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS2
-rw-r--r--Documentation/cpu-hotplug.txt2
-rw-r--r--MAINTAINERS2
3 files changed, 3 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index dc04d8f80a89..4fc997d58ab2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2576,7 +2576,7 @@ S: Toronto, Ontario
2576S: Canada 2576S: Canada
2577 2577
2578N: Zwane Mwaikambo 2578N: Zwane Mwaikambo
2579E: zwane@arm.linux.org.uk 2579E: zwanem@gmail.com
2580D: Various driver hacking 2580D: Various driver hacking
2581D: Lowlevel x86 kernel hacking 2581D: Lowlevel x86 kernel hacking
2582D: General debugging 2582D: General debugging
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index 786dc82f98ce..8cb9938cc47e 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -5,7 +5,7 @@
5 Rusty Russell <rusty@rustcorp.com.au> 5 Rusty Russell <rusty@rustcorp.com.au>
6 Srivatsa Vaddagiri <vatsa@in.ibm.com> 6 Srivatsa Vaddagiri <vatsa@in.ibm.com>
7 i386: 7 i386:
8 Zwane Mwaikambo <zwane@arm.linux.org.uk> 8 Zwane Mwaikambo <zwanem@gmail.com>
9 ppc64: 9 ppc64:
10 Nathan Lynch <nathanl@austin.ibm.com> 10 Nathan Lynch <nathanl@austin.ibm.com>
11 Joel Schopp <jschopp@austin.ibm.com> 11 Joel Schopp <jschopp@austin.ibm.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 30c1e3913cb3..5cfa91b1974a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7319,7 +7319,7 @@ S: Odd Fixes
7319F: drivers/media/usb/tlg2300/ 7319F: drivers/media/usb/tlg2300/
7320 7320
7321SC1200 WDT DRIVER 7321SC1200 WDT DRIVER
7322M: Zwane Mwaikambo <zwane@arm.linux.org.uk> 7322M: Zwane Mwaikambo <zwanem@gmail.com>
7323S: Maintained 7323S: Maintained
7324F: drivers/watchdog/sc1200wdt.c 7324F: drivers/watchdog/sc1200wdt.c
7325 7325