Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6

author Linus Torvalds <torvalds@home.osdl.org>

Wed, 4 Feb 2004 03:20:10 +0000 (19:20 -0800)

committer Linus Torvalds <torvalds@home.osdl.org>

Wed, 4 Feb 2004 03:20:10 +0000 (19:20 -0800)
author Linus Torvalds <torvalds@home.osdl.org>
Wed, 4 Feb 2004 03:20:10 +0000 (19:20 -0800)
committer Linus Torvalds <torvalds@home.osdl.org>
Wed, 4 Feb 2004 03:20:10 +0000 (19:20 -0800)
diff --cc drivers/cdrom/cdrom.c
Simple merge
diff --cc drivers/ide/ide.c
Simple merge
diff --cc drivers/scsi/sd.c
Simple merge
diff --cc include/linux/bio.h
Simple merge
author	Linus Torvalds <torvalds@home.osdl.org>
	Wed, 4 Feb 2004 03:20:10 +0000 (19:20 -0800)
committer	Linus Torvalds <torvalds@home.osdl.org>
	Wed, 4 Feb 2004 03:20:10 +0000 (19:20 -0800)
		1	2
drivers/cdrom/cdrom.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ide/ide.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/bio.h	patch \|	diff1 \|	diff2 \|	blob \| history