Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[mv-sheeva.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ca352b235f8ebd88c7680ac6836456d05ab4d87..1e15a0edc313ce38b1cb6fa68592aa6ac5de77ca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -387,21 +387,6 @@ P: Jaya Kumar
 M:     jayalk@intworks.biz
 S:     Maintained
 
-ARM26 ARCHITECTURE
-P:     Ian Molton
-M:     spyro@f2s.com
-S:     Maintained
-
-ARM26/ARCHIMEDES
-P:     Ian Molton
-M:     spyro@f2s.com
-S:     Maintained
-
-ARM26/A5000
-P:     John Appleby
-M:     john@dnsworld.co.uk
-S:     Maintained
-
 ARM MFM AND FLOPPY DRIVERS
 P:     Ian Molton
 M:     spyro@f2s.com
@@ -2179,6 +2164,8 @@ W:        http://www.kerneljanitors.org/
 S:     Maintained
 
 KERNEL NFSD
+P:     J. Bruce Fields
+M:     bfields@fieldses.org
 P:     Neil Brown
 M:     neilb@suse.de
 L:     nfs@lists.sourceforge.net
@@ -3347,6 +3334,14 @@ M:       thomas@winischhofer.net
 W:     http://www.winischhofer.at/linuxsisusbvga.shtml
 S:     Maintained
 
+SLAB ALLOCATOR
+P:     Christoph Lameter
+M:     clameter@sgi.com
+P:     Pekka Enberg
+M:     penberg@cs.helsinki.fi
+L:     linux-mm@kvack.org
+S:     Maintained
+
 SMC91x ETHERNET DRIVER
 P:     Nicolas Pitre
 M:     nico@cam.org
@@ -3674,11 +3669,9 @@ W:       http://www.auk.cx/tms380tr/
 S:     Maintained
 
 TULIP NETWORK DRIVER
-P:     Valerie Henson
-M:     val@nmt.edu
 L:     tulip-users@lists.sourceforge.net
 W:     http://sourceforge.net/projects/tulip/
-S:     Maintained
+S:     Orphan
 
 TUN/TAP driver
 P:     Maxim Krasnyansky