projects / powerpc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adfefb5 4351840)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Oct 2006 17:28:48 +0000 (10:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Oct 2006 17:28:48 +0000 (10:28 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] api: Select cryptomgr where needed
  [CRYPTO] api: fix crypto_alloc_base() return value


Trivial merge
DSM-G600 Linux 2.6