]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 2 Feb 2005 01:18:35 +0000 (17:18 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 2 Feb 2005 01:18:35 +0000 (17:18 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge