X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=CREDITS;h=6957ef4efab3a2fd60732456e5c515bee68bc57e;hb=497fce5e72a21f45929a786bf416ac03cbe09e2f;hp=521f00d1b549f5bd4e3a83a0d5b1b4fab142f6b0;hpb=f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6;p=linux-2.6 diff --git a/CREDITS b/CREDITS index 521f00d1b5..6957ef4efa 100644 --- a/CREDITS +++ b/CREDITS @@ -3101,7 +3101,7 @@ S: Minto, NSW, 2566 S: Australia N: Stephen Smalley -E: sds@epoch.ncsc.mil +E: sds@tycho.nsa.gov D: portions of the Linux Security Module (LSM) framework and security modules N: Chris Smith @@ -3203,7 +3203,7 @@ N: Eugene Surovegin E: ebs@ebshome.net W: http://kernel.ebshome.net/ P: 1024D/AE5467F1 FF22 39F1 6728 89F6 6E6C 2365 7602 F33D AE54 67F1 -D: Embedded PowerPC 4xx: I2C, PIC and random hacks/fixes +D: Embedded PowerPC 4xx: EMAC, I2C, PIC and random hacks/fixes S: Sunnyvale, California 94085 S: USA