diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 23:35:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 23:35:16 +0200 |
commit | 61f953cbaae26f930b8d937366270547e08c1290 (patch) | |
tree | 44cefef0fdd172ce4fe2083ed7695d86b76ed257 /drivers/scsi/sun3_scsi_vme.c | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
parent | Revert "hwrng: n2-drv - remove casts from void*" (diff) | |
download | linux-61f953cbaae26f930b8d937366270547e08c1290.tar.xz linux-61f953cbaae26f930b8d937366270547e08c1290.zip |
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
Diffstat (limited to 'drivers/scsi/sun3_scsi_vme.c')
0 files changed, 0 insertions, 0 deletions