tree 1abe6430d4944a034ad677db58817a3e4aa9bac5
parent 86460103c412f9e11aeb7950cce64b9e51539d4d
parent acd246b7494c629aa617da49716409566cf52149
author Linus Torvalds <torvalds@linux-foundation.org> 1242600485 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242600485 -0700

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