tree 7bbbad1430fa70bcf1c4daaba7dd1dc88306c3b8
parent 219f170a85fee524fa528ef75a0432b79af95d0b
parent 1777f1a978153e8b887c1e1eb5160ac46098b142
author Linus Torvalds <torvalds@linux-foundation.org> 1236128708 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1236128708 -0800

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: ixp4xx - Fix qmgr_request_queue build failure
  crypto: api - Fix module load deadlock with fallback algorithms