diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
| commit | ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 (patch) | |
| tree | a7c0d18d6486734dffb9498e30db5b226b6e23bf /CREDITS | |
| parent | c2956a3b0d1c17b38da369811a6ce93eb7a01a04 (diff) | |
| parent | 75deb6fa985bd3162b9472f1fc394e23294da816 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 6 |
1 files changed, 2 insertions, 4 deletions
| @@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG | |||
| 3643 | S: England | 3643 | S: England |
| 3644 | 3644 | ||
| 3645 | N: Chris Wright | 3645 | N: Chris Wright |
| 3646 | E: chrisw@osdl.org | 3646 | E: chrisw@sous-sol.org |
| 3647 | D: hacking on LSM framework and security modules. | 3647 | D: hacking on LSM framework and security modules. |
| 3648 | S: c/o OSDL | 3648 | S: Portland, OR |
| 3649 | S: 12725 SW Millikan Way, Suite 400 | ||
| 3650 | S: Beaverton, OR 97005 | ||
| 3651 | S: USA | 3649 | S: USA |
| 3652 | 3650 | ||
| 3653 | N: Michal Wronski | 3651 | N: Michal Wronski |