diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /MAINTAINERS | |
| parent | 071d7ab6649eb34a873a53e71635186e9117101d (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e6aa6aa789f5..e6e481483622 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1205,9 +1205,7 @@ M: hpa@zytor.com | |||
| 1205 | S: Maintained | 1205 | S: Maintained |
| 1206 | 1206 | ||
| 1207 | CPUSETS | 1207 | CPUSETS |
| 1208 | P: Paul Jackson | ||
| 1209 | P: Paul Menage | 1208 | P: Paul Menage |
| 1210 | M: pj@sgi.com | ||
| 1211 | M: menage@google.com | 1209 | M: menage@google.com |
| 1212 | L: linux-kernel@vger.kernel.org | 1210 | L: linux-kernel@vger.kernel.org |
| 1213 | W: http://www.bullopensource.org/cpuset/ | 1211 | W: http://www.bullopensource.org/cpuset/ |
| @@ -2719,6 +2717,7 @@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 | |||
| 2719 | P: Michael Kerrisk | 2717 | P: Michael Kerrisk |
| 2720 | M: mtk.manpages@gmail.com | 2718 | M: mtk.manpages@gmail.com |
| 2721 | W: http://www.kernel.org/doc/man-pages | 2719 | W: http://www.kernel.org/doc/man-pages |
| 2720 | L: linux-man@vger.kernel.org | ||
| 2722 | S: Supported | 2721 | S: Supported |
| 2723 | 2722 | ||
| 2724 | MARVELL LIBERTAS WIRELESS DRIVER | 2723 | MARVELL LIBERTAS WIRELESS DRIVER |