diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
| commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /MAINTAINERS | |
| parent | aecfcde920da8d32949f6cbbc1fc051b4ef9e7be (diff) | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3c3ce2b20322..c0a662d1c284 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1469,8 +1469,6 @@ L: linux-acpi@vger.kernel.org | |||
| 1469 | S: Supported | 1469 | S: Supported |
| 1470 | 1470 | ||
| 1471 | DOCUMENTATION (/Documentation directory) | 1471 | DOCUMENTATION (/Documentation directory) |
| 1472 | P: Michael Kerrisk | ||
| 1473 | M: mtk.manpages@gmail.com | ||
| 1474 | P: Randy Dunlap | 1472 | P: Randy Dunlap |
| 1475 | M: rdunlap@xenotime.net | 1473 | M: rdunlap@xenotime.net |
| 1476 | L: linux-doc@vger.kernel.org | 1474 | L: linux-doc@vger.kernel.org |
| @@ -2885,7 +2883,7 @@ P: Michael Kerrisk | |||
| 2885 | M: mtk.manpages@gmail.com | 2883 | M: mtk.manpages@gmail.com |
| 2886 | W: http://www.kernel.org/doc/man-pages | 2884 | W: http://www.kernel.org/doc/man-pages |
| 2887 | L: linux-man@vger.kernel.org | 2885 | L: linux-man@vger.kernel.org |
| 2888 | S: Supported | 2886 | S: Maintained |
| 2889 | 2887 | ||
| 2890 | MARVELL LIBERTAS WIRELESS DRIVER | 2888 | MARVELL LIBERTAS WIRELESS DRIVER |
| 2891 | P: Dan Williams | 2889 | P: Dan Williams |