Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 3 Jun 2005 15:54:02 +0000 (08:54 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 3 Jun 2005 15:54:02 +0000 (08:54 -0700)
commitd8d088d25822b0199fdfb392085e1cf8a5914a97
tree06f73bec1e8db08d68641ea1c88740eeb0e3e7fc
parentb05a720b374ac6af05b2fd4c70bb2c61a9f461ca
parentc92715b3c22e94105a8fd9e4a23047d05c5077e7
Merge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6