From: Nicolas Pitre Signed-off-by: Andrew Morton --- 25-akpm/CREDITS | 1 + 25-akpm/MAINTAINERS | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff -puN CREDITS~update-maintainers-credits CREDITS --- 25/CREDITS~update-maintainers-credits Tue Sep 21 15:00:01 2004 +++ 25-akpm/CREDITS Tue Sep 21 15:00:01 2004 @@ -2619,6 +2619,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 -puN MAINTAINERS~update-maintainers-credits MAINTAINERS --- 25/MAINTAINERS~update-maintainers-credits Tue Sep 21 15:00:01 2004 +++ 25-akpm/MAINTAINERS Tue Sep 21 15:00:01 2004 @@ -1780,6 +1780,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 @@ -1856,12 +1862,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 @@ -1980,6 +1980,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 _