Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 04:48:06 +0000 (21:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 04:48:06 +0000 (21:48 -0700)

Trivial merge