projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62688e5 ce026cb)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Aug 2012 04:58:04 +0000 (21:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Aug 2012 04:58:04 +0000 (21:58 -0700)
commit2d809dcd88f590d68dd741dc4d28a84128449fbd
treee00daba2e854f2646914f370157034db5dea071ctree | snapshot
parent62688e5b6465395c093b91bd4c29794758eb24fecommit | diff
parentce026cb9cbf1d529652394ea91fb8a459072be91commit | diff
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This push fixes a build error on 32-bit archs in the hifn driver as
  well as a potential deadlock in the caam driver."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix possible deadlock condition
  crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs
Unnamed repository; edit this file 'description' to name the repository.