X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=CREDITS;h=64511e2abc8e5ab94350ea1fc978901301ff90e2;hb=692a2061f6f2c360188af72f1f3404a5e7f0efce;hp=8e577ce4abeb4f44ffcb83a894c66130aebb6a58;hpb=5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f;p=linux-2.6 diff --git a/CREDITS b/CREDITS index 8e577ce4ab..64511e2abc 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 @@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG S: England N: Chris Wright -E: chrisw@osdl.org +E: chrisw@sous-sol.org D: hacking on LSM framework and security modules. -S: c/o OSDL -S: 12725 SW Millikan Way, Suite 400 -S: Beaverton, OR 97005 +S: Portland, OR S: USA N: Michal Wronski