From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Sep 2013 14:11:14 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.12-rc1~20
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=0898d2aa9db8b7770c83590d0326d0e6b62cef2b;p=sfrench%2Fcifs-2.6.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a 7+ year race condition in the crypto API that causes
  sporadic crashes when multiple threads load the same algorithm.

  It also fixes the crct10dif algorithm again to prevent boot failures
  on systems where the initramfs tool ignores module softdeps"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: crct10dif - Add fallback for broken initrds
  crypto: api - Fix race condition in larval lookup
---

0898d2aa9db8b7770c83590d0326d0e6b62cef2b