]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 May 2009 22:48:05 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 May 2009 22:48:05 +0000 (15:48 -0700)
commitcd208bcc7cb0acd851e25c951ec2a9c14b084eab
tree1abe6430d4944a034ad677db58817a3e4aa9bac5
parent86460103c412f9e11aeb7950cce64b9e51539d4d
parentacd246b7494c629aa617da49716409566cf52149
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: padlock - Revert aes-all alias to aes
  crypto: api - Fix algorithm module auto-loading
  crypto: eseqiv - Fix IV generation for sync algorithms
  crypto: ixp4xx - check firmware for crypto support
drivers/crypto/ixp4xx_crypto.c