Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 00:09:34 +0000 (16:09 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 00:09:34 +0000 (16:09 -0800)
commit88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d
treec03d8917ea8253c118bec12949c34595d7311bcd
parentd3ead3a206effab210813eafff4bfaa581295252
parent490fe3f05be3f7c87d7932bcb6e6e53e3db2cd9c
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] padlock: Fix alignment fault in aes_crypt_copy