commit | 66123549dbd75c67509c73b9d94bf7a9d2f4b286 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri May 18 20:46:45 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri May 18 20:46:45 2007 -0700 |
tree | 98588139d6cf56d524e5ce09d736f882f8e1bd4f | |
parent | 1a06a52ee1b0cdb65222474ba6186f3991df68b0 [diff] | |
parent | 29059d12e0c7f349aca6993acac20c5efbe13b81 [diff] |
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