| commit | 822b4b6fe38bbe23f6bc036288ecd934eef30be5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 10 13:25:50 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 10 13:25:50 2013 -0700 |
| tree | 56a0b52b4cf0fc35927bdab91980ab648dd79862 | |
| parent | ae75d84f3e29a1832b35cd342ac471bbf30bce4c [diff] | |
| parent | 68be0b1ae355c6deb11326df6758f80154f44cf0 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 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