Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 19 May 2007 03:46:45 +0000 (20:46 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 19 May 2007 03:46:45 +0000 (20:46 -0700)
commit66123549dbd75c67509c73b9d94bf7a9d2f4b286
tree98588139d6cf56d524e5ce09d736f882f8e1bd4f
parent1a06a52ee1b0cdb65222474ba6186f3991df68b0
parent29059d12e0c7f349aca6993acac20c5efbe13b81
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