1 files changed, 2 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 6957ef4efab3..1f171f1033bd 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: Portland, OR
-S: 12725 SW Millikan Way, Suite 400
-S: Beaverton, OR 97005
 S: USA
 N: Michal Wronski

diff --git a/CREDITS b/CREDITS index 6957ef4efab3..1f171f1033bd 100644 --- a/CREDITS +++ b/CREDITS
@@ -120,7 +120,6 @@ D: Author of lil (Linux Interrupt Latency benchmark)
120	D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)	120	D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
121	D: VM hacker	121	D: VM hacker
122	D: Various other kernel hacks	122	D: Various other kernel hacks
123	S: Via Cicalini 26
124	S: Imola 40026	123	S: Imola 40026
125	S: Italy	124	S: Italy
126		125
@@ -3643,11 +3642,9 @@ S: Cambridge. CB1 7EG
3643	S: England	3642	S: England
3644		3643
3645	N: Chris Wright	3644	N: Chris Wright
3646	E: chrisw@osdl.org	3645	E: chrisw@sous-sol.org
3647	D: hacking on LSM framework and security modules.	3646	D: hacking on LSM framework and security modules.
3648	S: c/o OSDL	3647	S: Portland, OR
3649	S: 12725 SW Millikan Way, Suite 400
3650	S: Beaverton, OR 97005
3651	S: USA	3648	S: USA
3652		3649
3653	N: Michal Wronski	3650	N: Michal Wronski