aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-08 17:56:41 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-08 17:56:41 -0400
commit4dd565134ece7e5d528d4c5288879310c54419e9 (patch)
treee08910d2d0feae0c030f8f01acc9b03eb760ad9a /MAINTAINERS
parent071d7ab6649eb34a873a53e71635186e9117101d (diff)
parent69849375d6b13e94d08cdc94b49b11fbab454a0e (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--MAINTAINERS3
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
1205S: Maintained 1205S: Maintained
1206 1206
1207CPUSETS 1207CPUSETS
1208P: Paul Jackson
1209P: Paul Menage 1208P: Paul Menage
1210M: pj@sgi.com
1211M: menage@google.com 1209M: menage@google.com
1212L: linux-kernel@vger.kernel.org 1210L: linux-kernel@vger.kernel.org
1213W: http://www.bullopensource.org/cpuset/ 1211W: http://www.bullopensource.org/cpuset/
@@ -2719,6 +2717,7 @@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
2719P: Michael Kerrisk 2717P: Michael Kerrisk
2720M: mtk.manpages@gmail.com 2718M: mtk.manpages@gmail.com
2721W: http://www.kernel.org/doc/man-pages 2719W: http://www.kernel.org/doc/man-pages
2720L: linux-man@vger.kernel.org
2722S: Supported 2721S: Supported
2723 2722
2724MARVELL LIBERTAS WIRELESS DRIVER 2723MARVELL LIBERTAS WIRELESS DRIVER