From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2008 18:13:57 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.28-rc8~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4e6f2ba97ff9099ef03bd38f84b59b5c2f89c1fe;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: api - Disallow cryptomgr as a module if algorithms are built-in
---

4e6f2ba97ff9099ef03bd38f84b59b5c2f89c1fe