Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 17:33:19 +0000 (09:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 17:33:19 +0000 (09:33 -0800)
commitec1248e70edc5cf7b485efcc7b41e44e10f422e5
tree80ca10a1ad9dc572e131a56a93fcf0c63c14d168
parent3d1f337b3e7378923c89f37afb573a918ef40be5
parent55e9dce37ddf3ab358ba1d1e9eef4ee4bd8174a6
Merge /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