]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Oct 2004 08:45:15 +0000 (01:45 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Oct 2004 08:45:15 +0000 (01:45 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge