[PARISC] Update CREDITS entries

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c1350d7e6789627d1f179b7665b5b603a2c032ea..509927e40bbbf92c9802aac8064a7ae82e18e5aa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1565,7 +1565,7 @@ S:        Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 P:     Kumar Gala
-M:     kumar.gala@freescale.com
+M:     galak@kernel.crashing.org
 W:     http://www.penguinppc.org/
 L:     linuxppc-embedded@ozlabs.org
 S:     Maintained
@@ -1873,6 +1873,11 @@ L:       linux-tr@linuxtr.net
 W:     http://www.linuxtr.net
 S:     Maintained
 
+OMNIKEY CARDMAN 4000 DRIVER
+P:     Harald Welte
+M:     laforge@gnumonks.org
+S:     Maintained
+
 OMNIKEY CARDMAN 4040 DRIVER
 P:     Harald Welte
 M:     laforge@gnumonks.org