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)
commit9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43
tree27a73405d3652dc6771fab28721b70e6d44ff47a
parentb1459461f1e0abd5c28317d6bff6f2ca612a719d
parent1b40efd772f4419fbc1a8940506424246985c333
Merge /pub/scm/linux/kernel/git/herbert/crypto-2.6
drivers/scsi/sg.c