tree 62e254b6fe3e753c6a2cee7f62dd1ad4ce5ca720
parent 4223a4a155f245d41c350ed9eba4fc32e965c4da
parent 13b79b971564ddd0f14e706592472adc8199e912
author Linus Torvalds <torvalds@linux-foundation.org> 1256166961 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1256166961 +0900

Merge git://git.kernel.org/pub/scm/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