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)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] padlock: Fix alignment fault in aes_crypt_copy


Trivial merge