diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /crypto/vmac.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'crypto/vmac.c')
| -rw-r--r-- | crypto/vmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/vmac.c b/crypto/vmac.c index 0999274a27a..f35ff8a3926 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c | |||
| @@ -95,7 +95,7 @@ const u64 mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ | |||
| 95 | 95 | ||
| 96 | /* | 96 | /* |
| 97 | * For highest performance the L1 NH and L2 polynomial hashes should be | 97 | * For highest performance the L1 NH and L2 polynomial hashes should be |
| 98 | * carefully implemented to take advantage of one's target architechture. | 98 | * carefully implemented to take advantage of one's target architecture. |
| 99 | * Here these two hash functions are defined multiple time; once for | 99 | * Here these two hash functions are defined multiple time; once for |
| 100 | * 64-bit architectures, once for 32-bit SSE2 architectures, and once | 100 | * 64-bit architectures, once for 32-bit SSE2 architectures, and once |
| 101 | * for the rest (32-bit) architectures. | 101 | * for the rest (32-bit) architectures. |