From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 19 May 2007 03:46:45 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.22-rc2~3
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=66123549dbd75c67509c73b9d94bf7a9d2f4b286;p=powerpc.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] tcrypt: Add missing error check
  [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again
---

66123549dbd75c67509c73b9d94bf7a9d2f4b286