diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /CREDITS | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'master'
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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 |