Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Oct 2009 23:16:01 +0000 (08:16 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Oct 2009 23:16:01 +0000 (08:16 +0900)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni-intel - Fix irq_fpu_usable usage
  crypto: padlock-sha - Fix stack alignment


Trivial merge