projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d4c6fa7 ff0a70f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 03:19:30 +0000 (20:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 03:19:30 +0000 (20:19 -0700)
commit6a76a6992341faab0ef31e7d97000e0cf336d0ba
treea585bf55b557ad746ff951119feb0a8bd014de08tree | snapshot
parentd4c6fa73fe984e504d52f3d6bba291fd76fe49f7commit | diff
parentff0a70fe053614e763eb3ac88bfea9c5615fce3bcommit | diff
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
Domain: SCM / Uncategorized;