Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2009 01:05:08 +0000 (17:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2009 01:05:08 +0000 (17:05 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ixp4xx - Fix qmgr_request_queue build failure
  crypto: api - Fix module load deadlock with fallback algorithms


Trivial merge