tree a585bf55b557ad746ff951119feb0a8bd014de08
parent d4c6fa73fe984e504d52f3d6bba291fd76fe49f7
parent ff0a70fe053614e763eb3ac88bfea9c5615fce3b
author Linus Torvalds <torvalds@linux-foundation.org> 1332472770 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1332472770 -0700

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 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