X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=CREDITS;h=1f171f1033bd27f46691610b44dd3671a9224c9a;hb=refs%2Fheads%2Fb2.6.16-omap1-h63xx;hp=6957ef4efab3a2fd60732456e5c515bee68bc57e;hpb=0b1fc9b86f49e1e73e473e06a16556ca0dce53ae;p=linux-2.6-omap-h63xx.git

diff --git a/CREDITS b/CREDITS
index 6957ef4efab..1f171f1033b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -120,7 +120,6 @@ D: Author of lil (Linux Interrupt Latency benchmark)
 D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
 D: VM hacker
 D: Various other kernel hacks
-S: Via Cicalini 26
 S: Imola 40026
 S: Italy
 
@@ -3643,11 +3642,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