]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Dec 2004 02:48:06 +0000 (18:48 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Dec 2004 02:48:06 +0000 (18:48 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge