Merge HEAD from ../scsi-iscsi-2.6

author James Bottomley <jejb@titanic.(none)>

Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)

committer James Bottomley <jejb@titanic.(none)>

Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
author James Bottomley <jejb@titanic.(none)>
Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
committer James Bottomley <jejb@titanic.(none)>
Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
diff --cc drivers/scsi/Kconfig
Simple merge
diff --cc drivers/scsi/Makefile
Simple merge
author	James Bottomley <jejb@titanic.(none)>
	Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
committer	James Bottomley <jejb@titanic.(none)>
	Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
		1	2
drivers/scsi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history