diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /CREDITS | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
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 |