diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:11:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:11:50 -0400 |
| commit | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (patch) | |
| tree | f7c5c5e964c220de30fcdcd06b0f1efdb3e22439 /Documentation | |
| parent | 3863e72414fa2ebf5f3b615d1bf99de32e59980a (diff) | |
| parent | d70063c4634af060a5387337b7632f6334ca3458 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'Documentation')
| -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 |