author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 10 Jun 2013 20:25:50 +0000 (13:25 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 10 Jun 2013 20:25:50 +0000 (13:25 -0700) |
Pull crypto fixes from Herbert Xu:
"This fixes a build problem in sahara and temporarily disables two new
optimisations because of performance regressions until a permanent fix
is ready"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sahara - fix building as module
crypto: blowfish - disable AVX2 implementation
crypto: twofish - disable AVX2 implementation
"This fixes a build problem in sahara and temporarily disables two new
optimisations because of performance regressions until a permanent fix
is ready"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sahara - fix building as module
crypto: blowfish - disable AVX2 implementation
crypto: twofish - disable AVX2 implementation
Trivial merge