diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-21 13:14:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-21 13:14:07 -0700 |
| commit | 00d94a6a5e3d6a44818e2911a4d606e28e29fecb (patch) | |
| tree | 15a524318349cb4075f6dd69d87e4414ba54ed31 /net/sysctl_net.c | |
| parent | 8b12e2505ad8c5010922e45f896d908fd1436709 (diff) | |
| parent | b6f34d44cb341ad32f08717d1a2c418e6053a031 (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: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template
crypto: aes-ni - Do not sleep when using the FPU
crypto: aes-ni - Fix cbc mode IV saving
crypto: padlock-aes - work around Nano CPU errata in CBC mode
crypto: padlock-aes - work around Nano CPU errata in ECB mode
Diffstat (limited to 'net/sysctl_net.c')
0 files changed, 0 insertions, 0 deletions