diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /CREDITS | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
Merge branch 'master'
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 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 |