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)
commit4fe71dba2f2d550545580d409f432153c6454e59
tree62e254b6fe3e753c6a2cee7f62dd1ad4ce5ca720
parent4223a4a155f245d41c350ed9eba4fc32e965c4da
parent13b79b971564ddd0f14e706592472adc8199e912
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* 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