diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 07:53:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 07:53:33 -0700 |
commit | aa57e0b281453334267e836d15cfdb933f6d6f97 (patch) | |
tree | 2c3e1dc9a396550317e15f4be9f7e0d101bf501e /crypto/khazad.c | |
parent | 865ca084fdc68cd9b658da4b098008278da8fed3 (diff) | |
parent | 84cba178a3b88efe2668a9039f70abda072faa21 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- The selftest overreads the IV test vector.
- Fix potential infinite loop in sunxi-ss driver.
- Fix powerpc build failure when VMX is set without VSX"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: testmgr - don't copy from source IV too much
crypto: sunxi-ss - Fix a possible driver hang with ciphers
crypto: vmx - VMX crypto should depend on CONFIG_VSX
Diffstat (limited to 'crypto/khazad.c')
0 files changed, 0 insertions, 0 deletions