From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jun 2013 20:25:50 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.10-rc6~33
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=822b4b6fe38bbe23f6bc036288ecd934eef30be5;p=linux-2.6-block.git

Merge git://git./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
---

822b4b6fe38bbe23f6bc036288ecd934eef30be5