[PATCH] update MAINTAINERS/CREDITS

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/CREDITS b/CREDITS
index bb34801..22252bd 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -2618,6 +2618,7 @@ N: Nicolas Pitre
 E: nico@cam.org
 D: StrongARM SA1100 support integrator & hacker
 D: Xscale PXA architecture
+D: unified SMC 91C9x/91C11x ethernet driver (smc91x)
 S: Montreal, Quebec, Canada
 
 N: Ken Pizzini

diff --git a/MAINTAINERS b/MAINTAINERS
index e2258ec..eb7813b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1757,6 +1757,12 @@ M:       promise@pnd-pc.demon.co.uk
 W:     http://www.pnd-pc.demon.co.uk/promise/
 S:     Maintained
 
+PXA2xx SUPPORT
+P:     Nicolas Pitre
+M:     nico@cam.org
+L:     linux-arm-kernel@lists.arm.linux.org.uk
+S:     Maintained
+
 QNX4 FILESYSTEM
 P:     Anders Larsen
 M:     al@alarsen.net
@@ -1833,12 +1839,6 @@ M:       michael@mihu.de
 W:     http://www.mihu.de/linux/saa7146
 S:     Maintained
 
-SA1100 SUPPORT
-P:     Nicolas Pitre
-M:     nico@cam.org
-L:     linux-arm@lists.arm.linux.org.uk
-S:     Maintained
-
 SBPCD CDROM DRIVER
 P:     Eberhard Moenkeberg
 M:     emoenke@gwdg.de
@@ -1957,6 +1957,11 @@ W:       http://samba.org/
 L:     samba@samba.org
 S:     Maintained
 
+SMC91x ETHERNET DRIVER
+P:     Nicolas Pitre
+M:     nico@cam.org
+S:     Maintained
+
 SNA NETWORK LAYER
 P:     Jay Schulist
 M:     jschlst@samba.org