James Bottomley 849a8924a6 Merge by Hand ...

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2005-11-04 22:29:52 -06:00

..

iscsi_if.h

…

iscsi_proto.h

[SCSI] iscsi: rename some proto defs

2005-09-20 12:35:27 -05:00

scsi_cmnd.h

[PATCH] fix missing includes

2005-10-30 17:37:32 -08:00

scsi_dbg.h

…

scsi_device.h

[SCSI] introduce sfoo_printk, sfoo_id, sfoo_channel helpers

2005-10-28 20:47:24 -05:00

scsi_devinfo.h

…

scsi_driver.h

…

scsi_eh.h

…

scsi_host.h

[SCSI] kill unused scsi_scan_single_target()

2005-10-28 20:29:18 -05:00

scsi_ioctl.h

…

scsi_request.h

[PATCH] gfp_t: drivers/scsi

2005-10-28 08:16:50 -07:00

scsi_tcq.h

…

scsi_transport_fc.h

Merge by Hand

2005-11-04 22:29:52 -06:00

scsi_transport_iscsi.h

…

scsi_transport_sas.h

[SCSI] sas: add support for PHY resets

2005-10-28 19:08:03 -05:00

scsi_transport_spi.h

…

scsi_transport.h

…

scsi.h

…

scsicam.h

…

sg_request.h

…

sg.h

…

srp.h

IB: Add SCSI RDMA Protocol (SRP) initiator

2005-11-02 14:07:13 -08:00