X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=CREDITS;h=090ed4b004a5b216c821ec820f1440c35c253402;hb=9bad32b2c63c985fc9f04b29186974ad5bb0b74c;hp=748301954ab7c1f3092da9bccbe81882bb88a0e4;hpb=4c9e94dff65ca75b917ff0b5de2e44881062a8e8;p=linux-2.6-microblaze.git

diff --git a/CREDITS b/CREDITS
index 748301954ab7..090ed4b004a5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -740,6 +740,11 @@ S: (ask for current address)
 S: Portland, Oregon
 S: USA
 
+N: Jason Cooper
+D: ARM/Marvell SOC co-maintainer
+D: irqchip co-maintainer
+D: MVEBU PCI DRIVER co-maintainer
+
 N: Robin Cornelius
 E: robincornelius@users.sourceforge.net
 D: Ralink rt2x00 WLAN driver
@@ -2505,15 +2510,6 @@ W: http://www.rdrop.com/users/paulmck/
 D: RCU and variants
 D: rcutorture module
 
-N: Mike McLagan
-E: mike.mclagan@linux.org
-W: http://www.invlogic.com/~mmclagan
-D: DLCI/FRAD drivers for Sangoma SDLAs
-S: Innovative Logic Corp
-S: Post Office Box 1068
-S: Laurel, Maryland 20732
-S: USA
-
 N: Bradley McLean
 E: brad@bradpc.gaylord.com
 D: Device driver hacker