diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /MAINTAINERS | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2f7d1066c8d7..1c5a8a5e6504 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1742,7 +1742,7 @@ S: Maintained | |||
| 1742 | 1742 | ||
| 1743 | OPL3-SA2, SA3, and SAx DRIVER | 1743 | OPL3-SA2, SA3, and SAx DRIVER |
| 1744 | P: Zwane Mwaikambo | 1744 | P: Zwane Mwaikambo |
| 1745 | M: zwane@commfireservices.com | 1745 | M: zwane@arm.linux.org.uk |
| 1746 | L: linux-sound@vger.kernel.org | 1746 | L: linux-sound@vger.kernel.org |
| 1747 | S: Maintained | 1747 | S: Maintained |
| 1748 | 1748 | ||
| @@ -1998,7 +1998,7 @@ S: Maintained | |||
| 1998 | 1998 | ||
| 1999 | SC1200 WDT DRIVER | 1999 | SC1200 WDT DRIVER |
| 2000 | P: Zwane Mwaikambo | 2000 | P: Zwane Mwaikambo |
| 2001 | M: zwane@commfireservices.com | 2001 | M: zwane@arm.linux.org.uk |
| 2002 | S: Maintained | 2002 | S: Maintained |
| 2003 | 2003 | ||
| 2004 | SCHEDULER | 2004 | SCHEDULER |