| commit | 61f953cbaae26f930b8d937366270547e08c1290 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:35:16 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:35:16 2010 -0700 |
| tree | 44cefef0fdd172ce4fe2083ed7695d86b76ed257 | |
| parent | a44a553f827f28d46130c9818dbcb95f4262b96c [diff] | |
| parent | 50b6e71ae83714be509b80727dbf90fa8b1c0717 [diff] |
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: Revert "hwrng: n2-drv - remove casts from void*" crypto: testmgr - Default to no tests crypto: testmgr - Fix test disabling option crypto: hash - Fix handling of small unaligned buffers