Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 00:21:03 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 00:21:03 +0000 (17:21 -0700)

Trivial merge