tree 2383c0909c94b389ec75412748aced1678cf5967
parent 5a7d8a28080caed7fd4cb1b81d092adac4445e8e
parent 26052f9b9bb8de4f6a57165b0a803de9c26138bd
author Linus Torvalds <torvalds@linux-foundation.org> 1379081474 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1379081474 -0700

Merge git://git.kernel.org/pub/scm/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