diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /CREDITS | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 8 |
1 files changed, 3 insertions, 5 deletions
| @@ -3101,7 +3101,7 @@ S: Minto, NSW, 2566 | |||
| 3101 | S: Australia | 3101 | S: Australia |
| 3102 | 3102 | ||
| 3103 | N: Stephen Smalley | 3103 | N: Stephen Smalley |
| 3104 | E: sds@epoch.ncsc.mil | 3104 | E: sds@tycho.nsa.gov |
| 3105 | D: portions of the Linux Security Module (LSM) framework and security modules | 3105 | D: portions of the Linux Security Module (LSM) framework and security modules |
| 3106 | 3106 | ||
| 3107 | N: Chris Smith | 3107 | N: Chris Smith |
| @@ -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 |