Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 23:46:40 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 23:46:40 +0000 (16:46 -0700)

Trivial merge