James Bottomley 297b8a0734 Merge branch 'postmerge' into for-linus ... Signed-off-by: James Bottomley <JBottomley@Parallels.com>		2013-05-10 07:54:01 -07:00
..
fc	UAPI: (Scripted) Disintegrate include/scsi/fc	2013-01-07 14:58:36 -08:00
fc_encode.h
fc_frame.h
fcoe_sysfs.h	libfcoe, fcoe, bnx2fc: Add new fcoe control interface	2012-12-14 10:38:54 -08:00
iscsi_if.h	[SCSI] scsi_transport_iscsi: Declare portal type string macros for generic use	2013-04-11 15:34:33 -07:00
iscsi_proto.h
libfc.h	libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}	2013-03-25 16:03:03 -07:00
libfcoe.h	libfcoe, fcoe: consolidate the fcoe_ctlr_get_lesb/fcoe_get_lesb	2012-12-14 10:38:55 -08:00
libiscsi_tcp.h
libiscsi.h	[SCSI] libiscsi: export function iscsi_switch_str_param	2013-04-11 15:26:48 -07:00
libsas.h	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
libsrp.h
osd_attributes.h
osd_initiator.h
osd_ore.h
osd_protocol.h	[SCSI] libosd: remover duplicate __bitwise annotation	2013-05-02 12:15:10 -07:00
osd_sec.h
osd_sense.h
osd_types.h
sas_ata.h	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
sas.h	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
scsi_bsg_iscsi.h
scsi_cmnd.h
scsi_dbg.h
scsi_device.h	[SCSI] sd: use REQ_PM in sd's runtime suspend operation	2013-05-06 12:48:17 -07:00
scsi_devinfo.h
scsi_dh.h
scsi_driver.h
scsi_eh.h
scsi_host.h	scsi: bury ->proc_info()	2013-04-09 14:13:29 -04:00
scsi_ioctl.h
scsi_tcq.h
scsi_tgt_if.h
scsi_tgt.h
scsi_transport_fc.h
scsi_transport_iscsi.h	[SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used	2013-05-10 07:47:53 -07:00
scsi_transport_sas.h	[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type	2013-05-10 07:47:52 -07:00
scsi_transport_spi.h
scsi_transport_srp.h	IB/srp: Allow SRP disconnect through sysfs	2012-11-30 17:40:33 -08:00
scsi_transport.h
scsi.h
scsicam.h
sg.h
srp.h