diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /crypto/vmac.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 0999274a27ac..f35ff8a3926e 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. |