From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Jun 2009 20:14:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.31-rc1~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00d94a6a5e3d6a44818e2911a4d606e28e29fecb;p=platform%2Fkernel%2Flinux-3.10.git

Merge git://git./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
---

00d94a6a5e3d6a44818e2911a4d606e28e29fecb