Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:10:06 +0000 (09:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:10:06 +0000 (09:10 -0700)
commit0c27011a7562f2b67bec61509e21113ec125aba1
tree5067020033474b2f00926796511c7bbc8b149709
parentad360bbbbecc90c654ea1fcd8178366814a9f93a
parent189fe3174ce93f4c949325426c87c4d875a13424
Merge /pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] cryptd: Fix problem with cryptd and the freezer