diff options
-rw-r--r-- | CREDITS | 2 | ||||
-rw-r--r-- | Documentation/cpu-hotplug.txt | 2 | ||||
-rw-r--r-- | MAINTAINERS | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -2576,7 +2576,7 @@ S: Toronto, Ontario | |||
2576 | S: Canada | 2576 | S: Canada |
2577 | 2577 | ||
2578 | N: Zwane Mwaikambo | 2578 | N: Zwane Mwaikambo |
2579 | E: zwane@arm.linux.org.uk | 2579 | E: zwanem@gmail.com |
2580 | D: Various driver hacking | 2580 | D: Various driver hacking |
2581 | D: Lowlevel x86 kernel hacking | 2581 | D: Lowlevel x86 kernel hacking |
2582 | D: General debugging | 2582 | D: 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 | |||
7319 | F: drivers/media/usb/tlg2300/ | 7319 | F: drivers/media/usb/tlg2300/ |
7320 | 7320 | ||
7321 | SC1200 WDT DRIVER | 7321 | SC1200 WDT DRIVER |
7322 | M: Zwane Mwaikambo <zwane@arm.linux.org.uk> | 7322 | M: Zwane Mwaikambo <zwanem@gmail.com> |
7323 | S: Maintained | 7323 | S: Maintained |
7324 | F: drivers/watchdog/sc1200wdt.c | 7324 | F: drivers/watchdog/sc1200wdt.c |
7325 | 7325 | ||