diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /CREDITS | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge branch 'origin'
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 |