]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b2f2303 06efca8)
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)
commit90327b7421a3c7b9e8f52f56cddcde5b8846de09
treee00daba2e854f2646914f370157034db5dea071ctree | snapshot
parentb2f2303ce778ab1a8025224218e3a26f019b1afccommit | diff
parent06efca8a8e39e3f30b23afbf4522c344dcb18182commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.