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
This commit is contained in:
Linus Torvalds 2008-12-10 10:13:57 -08:00
commit 4e6f2ba97f
2 changed files with 41 additions and 13 deletions