The following commit has been merged in the linux branch: commit 4fe71dba2f2d550545580d409f432153c6454e59 Merge: 4223a4a155f245d41c350ed9eba4fc32e965c4da 13b79b971564ddd0f14e706592472adc8199e912 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 22 08:16:01 2009 +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