Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)]
1  2 
MAINTAINERS
drivers/block/ll_rw_blk.c
drivers/scsi/Kconfig
drivers/scsi/Makefile
drivers/scsi/ibmvscsi/ibmvscsi.c
fs/bio.c
include/linux/bio.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/bio.c
Simple merge
Simple merge