tree 5067020033474b2f00926796511c7bbc8b149709
parent ad360bbbbecc90c654ea1fcd8178366814a9f93a
parent 189fe3174ce93f4c949325426c87c4d875a13424
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180627806 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180627806 -0700

Merge master.kernel.org:/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