From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 21 Mar 2006 17:33:19 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.17-rc1~1174
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ec1248e70edc5cf7b485efcc7b41e44e10f422e5;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] aes: Fixed array boundary violation
  [CRYPTO] tcrypt: Fix key alignment
  [CRYPTO] all: Add missing cra_alignmask
  [CRYPTO] all: Use kzalloc where possible
  [CRYPTO] api: Align tfm context as wide as possible
  [CRYPTO] twofish: Use rol32/ror32 where appropriate
---

ec1248e70edc5cf7b485efcc7b41e44e10f422e5