tree 9029d50997bb9ab8ed175e24668f39f83244ea07
parent 44f6cc318abb51956f823d4eed605c1e354f6186
parent 6a0fcbb4dad15f02ca8f8ae6324fcd3fc43b9d35
author Linus Torvalds <torvalds@linux-foundation.org> 1228932837 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228932837 -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: api - Disallow cryptomgr as a module if algorithms are built-in