aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS4
2 files changed, 3 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 50121d432b62..f553f8cfaa62 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
2423S: Canada 2423S: Canada
2424 2424
2425N: Zwane Mwaikambo 2425N: Zwane Mwaikambo
2426E: zwane@linuxpower.ca 2426E: zwane@arm.linux.org.uk
2427W: http://function.linuxpower.ca
2428D: Various driver hacking 2427D: Various driver hacking
2429D: Lowlevel x86 kernel hacking 2428D: Lowlevel x86 kernel hacking
2430D: General debugging 2429D: General debugging
diff --git a/MAINTAINERS b/MAINTAINERS
index 33122b1519ca..564a03e61a0c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1739,7 +1739,7 @@ S: Maintained
1739 1739
1740OPL3-SA2, SA3, and SAx DRIVER 1740OPL3-SA2, SA3, and SAx DRIVER
1741P: Zwane Mwaikambo 1741P: Zwane Mwaikambo
1742M: zwane@commfireservices.com 1742M: zwane@arm.linux.org.uk
1743L: linux-sound@vger.kernel.org 1743L: linux-sound@vger.kernel.org
1744S: Maintained 1744S: Maintained
1745 1745
@@ -1995,7 +1995,7 @@ S: Maintained
1995 1995
1996SC1200 WDT DRIVER 1996SC1200 WDT DRIVER
1997P: Zwane Mwaikambo 1997P: Zwane Mwaikambo
1998M: zwane@commfireservices.com 1998M: zwane@arm.linux.org.uk
1999S: Maintained 1999S: Maintained
2000 2000
2001SCHEDULER 2001SCHEDULER