Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/csiostor/csio_scsi.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

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

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/target_core_sbc.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/usb/gadget/legacy/tcm_usb_gadget.c
Simple merge

diff --cc include/scsi/libsas.h
Simple merge

diff --cc include/scsi/scsi_host.h
Simple merge

diff --cc include/trace/events/target.h
Simple merge