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)
commit9c1a7747059a65dbc2d7703978841a37db699fbf
tree7bbbad1430fa70bcf1c4daaba7dd1dc88306c3b8
parent219f170a85fee524fa528ef75a0432b79af95d0b
parent1777f1a978153e8b887c1e1eb5160ac46098b142
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* 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