Jeff Garzik 71d530cd1b Merge branch 'master' into upstream ... Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h		2006-06-22 22:11:56 -04:00
..
iscsi_if.h	…
iscsi_proto.h	[SCSI] iscsi: update version	2006-05-20 09:36:38 -05:00
libiscsi.h	[SCSI] iscsi: don't switch states when just cleaning up	2006-06-05 19:10:45 -04:00
scsi.h	…
scsi_cmnd.h	Merge branch 'master' into upstream	2006-06-22 22:11:56 -04:00
scsi_dbg.h	[SCSI] remove scsi_request infrastructure	2006-06-10 16:24:40 -05:00
scsi_device.h	…
scsi_devinfo.h	…
scsi_driver.h	…
scsi_eh.h	[SCSI] remove scsi_request infrastructure	2006-06-10 16:24:40 -05:00
scsi_host.h	…
scsi_ioctl.h	…
scsi_tcq.h	…
scsi_transport.h	…
scsi_transport_fc.h	…
scsi_transport_iscsi.h	[SCSI] iscsi: fix writepsace race	2006-06-05 19:12:25 -04:00
scsi_transport_sas.h	…
scsi_transport_spi.h	…
scsicam.h	…
sg.h	…
srp.h	[SCSI] srp.h: Add I/O Class values	2006-06-17 20:37:38 -07:00