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) | |||
| 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 |