From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 03:19:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.4-rc1~131
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a76a6992341faab0ef31e7d97000e0cf336d0ba;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a build problem where two crypto modules both try to export
  the same symbols (which shouldn't have been exported in the first
  place)."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: twofish-x86_64-3way - module init/exit functions should be static
  crypto: camellia-x86_64 - module init/exit functions should be static
---

6a76a6992341faab0ef31e7d97000e0cf336d0ba