Merge remote-tracking branch 'scsi/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)
diff --cc drivers/s390/cio/qdio_main.c
Simple merge
diff --cc drivers/scsi/Makefile
Simple merge
diff --cc drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
Simple merge
diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge
diff --cc drivers/scsi/qla4xxx/Kconfig

index 0f5599e0abf6a6d362e0f94312faaa7abe3ea2a7,5b1aed4f0754639c27444a9886d495f5a71d014a..f1ad02ea212b6331f16619ca8de821b97da977de
--- 1/drivers/scsi/qla4xxx/Kconfig
--- 2/drivers/scsi/qla4xxx/Kconfig
+++ b/drivers/scsi/qla4xxx/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
   config SCSI_QLA_ISCSI
         tristate "QLogic ISP4XXX and ISP82XX host adapter family support"
- -      depends on PCI && SCSI
+ +      depends on PCI && SCSI && NET
         select SCSI_ISCSI_ATTRS
+       select ISCSI_BOOT_SYSFS
         ---help---
         This driver supports the QLogic 40xx (ISP4XXX) and 8022 (ISP82XX)
         iSCSI host adapter family.
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)
		1	2
drivers/s390/cio/qdio_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history