Merge remote-tracking branch 'scsi/master'

diff --cc drivers/s390/cio/qdio_main.c
Simple merge

diff --cc drivers/scsi/Kconfig
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/libfc/fc_exch.c
Simple merge

diff --cc drivers/scsi/libfc/fc_fcp.c
Simple merge

diff --cc drivers/scsi/libsas/sas_expander.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_isr.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.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.