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/xts.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/xts.c')
| -rw-r--r-- | crypto/xts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/xts.c b/crypto/xts.c index 555ecaab1e54..851705446c82 100644 --- a/crypto/xts.c +++ b/crypto/xts.c | |||
| @@ -45,7 +45,7 @@ static int setkey(struct crypto_tfm *parent, const u8 *key, | |||
| 45 | return -EINVAL; | 45 | return -EINVAL; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | /* we need two cipher instances: one to compute the inital 'tweak' | 48 | /* we need two cipher instances: one to compute the initial 'tweak' |
| 49 | * by encrypting the IV (usually the 'plain' iv) and the other | 49 | * by encrypting the IV (usually the 'plain' iv) and the other |
| 50 | * one to encrypt and decrypt the data */ | 50 | * one to encrypt and decrypt the data */ |
| 51 | 51 | ||