diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 20:46:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 20:46:45 -0700 |
| commit | 66123549dbd75c67509c73b9d94bf7a9d2f4b286 (patch) | |
| tree | 98588139d6cf56d524e5ce09d736f882f8e1bd4f /Documentation/i386/boot.txt | |
| 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
Diffstat (limited to 'Documentation/i386/boot.txt')
0 files changed, 0 insertions, 0 deletions