Merge 'scsi-fixes' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 03:58:13 +0000 (20:58 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 03:58:13 +0000 (20:58 -0700)

Trivial merge