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

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