diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /Documentation/crypto/api-intro.txt | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'Documentation/crypto/api-intro.txt')
| -rw-r--r-- | Documentation/crypto/api-intro.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt index a2d5b4900772..74dffc68ff9f 100644 --- a/Documentation/crypto/api-intro.txt +++ b/Documentation/crypto/api-intro.txt | |||
| @@ -223,6 +223,7 @@ CAST5 algorithm contributors: | |||
| 223 | 223 | ||
| 224 | TEA/XTEA algorithm contributors: | 224 | TEA/XTEA algorithm contributors: |
| 225 | Aaron Grothe | 225 | Aaron Grothe |
| 226 | Michael Ringe | ||
| 226 | 227 | ||
| 227 | Khazad algorithm contributors: | 228 | Khazad algorithm contributors: |
| 228 | Aaron Grothe | 229 | Aaron Grothe |