From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Mar 2009 01:05:08 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9c1a7747059a65dbc2d7703978841a37db699fbf;p=linux-2.6-omap-h63xx.git

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
---

9c1a7747059a65dbc2d7703978841a37db699fbf