]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@home.osdl.org>
Sat, 24 Jan 2004 03:51:17 +0000 (19:51 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Sat, 24 Jan 2004 03:51:17 +0000 (19:51 -0800)
into home.osdl.org:/home/torvalds/v2.5/linux

1  2 
drivers/scsi/Kconfig

Simple merge