Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

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

Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)

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

Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/block/ll_rw_blk.c
Simple merge
diff --cc drivers/scsi/Kconfig
Simple merge
diff --cc drivers/scsi/Makefile
Simple merge
diff --cc drivers/scsi/ibmvscsi/ibmvscsi.c
Simple merge
diff --cc fs/bio.c
Simple merge
diff --cc include/linux/bio.h
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/ll_rw_blk.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvscsi.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/bio.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/bio.h	patch \|	diff1 \|	diff2 \|	blob \| history