tree 98588139d6cf56d524e5ce09d736f882f8e1bd4f
parent 1a06a52ee1b0cdb65222474ba6186f3991df68b0
parent 29059d12e0c7f349aca6993acac20c5efbe13b81
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1179546405 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1179546405 -0700

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