Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:57:45 +0000 (21:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:57:45 +0000 (21:57 -0700)
commitd6c93e1ddde769010f9c81bbfab41a9844c0e9ba
treeab36ce8c77403da4362de0447d188cd049d52d81
parent5694ca9f46202c50df525472abb6d8c1dee4f8eb
parentcc08632f8f26d479500f8107c84e206770cb901c
Merge /pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] padlock: Fix alignment after aes_ctx rearrange