tree 15a524318349cb4075f6dd69d87e4414ba54ed31
parent 8b12e2505ad8c5010922e45f896d908fd1436709
parent b6f34d44cb341ad32f08717d1a2c418e6053a031
author Linus Torvalds <torvalds@linux-foundation.org> 1245615247 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245615247 -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: 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