Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2008 18:13:57 +0000 (10:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2008 18:13:57 +0000 (10:13 -0800)
commit4e6f2ba97ff9099ef03bd38f84b59b5c2f89c1fe
tree9029d50997bb9ab8ed175e24668f39f83244ea07
parent44f6cc318abb51956f823d4eed605c1e354f6186
parent6a0fcbb4dad15f02ca8f8ae6324fcd3fc43b9d35
Merge git://git./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