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)

Trivial merge