From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2012 04:58:04 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.6-rc4~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2d809dcd88f590d68dd741dc4d28a84128449fbd;p=~emulex%2Finfiniband.git

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

2d809dcd88f590d68dd741dc4d28a84128449fbd