David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
fc	[SCSI] net, libfcoe: Add the FCoE Initialization Protocol ethertype	2009-06-08 13:29:17 -05:00
fc_encode.h	[SCSI] libfc: A modular Fibre Channel library	2008-12-29 11:24:33 -06:00
fc_frame.h	[SCSI] libfc: add support of large receive offload by ddp in fc_fcp	2009-03-13 15:15:15 -05:00
iscsi_if.h	[SCSI] iscsi class: Add new NETLINK_ISCSI messages for cnic/bnx2i driver.	2009-06-09 10:22:35 -05:00
iscsi_proto.h	[SCSI] iscsi_tcp: Enable any size command	2008-07-12 08:22:23 -05:00
libfc.h	[SCSI] libfc,fcoe,fnic: Separate rport and lport max retry counts	2009-05-23 15:44:18 -05:00
libfcoe.h	fcoe: adds spma mode support	2009-05-17 21:04:08 -07:00
libiscsi_tcp.h	[SCSI] iscsi_tcp: make padbuf non-static	2009-01-13 10:41:34 -06:00
libiscsi.h	[SCSI] libiscsi: add task aborted state	2009-05-23 15:44:13 -05:00
libsas.h	include: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:16:54 -04:00
libsrp.h
osd_attributes.h	[SCSI] libosd: OSD2r05: Attribute definitions	2009-06-10 08:54:07 -05:00
osd_initiator.h	[SCSI] osduld: use filp_open() when looking up an osd-device	2009-06-10 09:00:25 -05:00
osd_protocol.h	[SCSI] libosd: OSD2r05: Additional command enums	2009-06-10 08:54:04 -05:00
osd_sec.h	[SCSI] libosd: OSDv1 Headers	2009-03-12 12:58:06 -05:00
osd_sense.h	[SCSI] libosd: SCSI/OSD Sense decoding support	2009-03-12 12:58:09 -05:00
osd_types.h	[SCSI] libosd: OSDv1 Headers	2009-03-12 12:58:06 -05:00
sas_ata.h	[SCSI] libsas: fix missing inlines in header file	2008-04-07 12:19:10 -05:00
sas.h	[SCSI] libsas: Convert sas_proto users to sas_protocol	2008-01-11 18:22:41 -06:00
scsi_cmnd.h	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
scsi_dbg.h	[SCSI] Fix device not ready printk	2007-10-12 14:51:56 -04:00
scsi_device.h	[SCSI] remove scsi_req_map_sg	2009-03-12 12:58:10 -05:00
scsi_devinfo.h
scsi_dh.h	[SCSI] scsi_dh: attach to hardware handler from dm-mpath	2008-07-26 15:14:53 -04:00
scsi_driver.h	Revert "scsi: revert "[SCSI] Get rid of scsi_cmnd->done""	2008-01-06 10:17:12 -08:00
scsi_eh.h	[SCSI] scsi_eh_prep_cmnd should save scmd->underflow	2008-07-26 15:14:56 -04:00
scsi_host.h	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
scsi_ioctl.h	[PATCH] don't mess with file in scsi_nonblockable_ioctl()	2008-10-21 07:47:28 -04:00
scsi_netlink_fc.h
scsi_netlink.h	[SCSI] scsi_netlink: Add transport and LLD recieve and event support	2008-10-03 11:46:13 -05:00
scsi_scan.h	PM/Hibernate: Wait for SCSI devices scan to complete during resume	2009-04-13 11:37:07 -07:00
scsi_tcq.h	scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map	2008-10-27 19:25:30 +01:00
scsi_tgt_if.h
scsi_tgt.h
scsi_transport_fc.h	[SCSI] fc-transport: Close state transition-window during rport deletion.	2009-05-15 12:16:46 -04:00
scsi_transport_iscsi.h	[SCSI] iscsi class: Add new NETLINK_ISCSI messages for cnic/bnx2i driver.	2009-06-09 10:22:35 -05:00
scsi_transport_sas.h	SCSI: convert struct class_device to struct device	2008-04-19 19:10:33 -07:00
scsi_transport_spi.h
scsi_transport_srp.h
scsi_transport.h	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
scsi.h	[SCSI] Make scsi.h independent of the rest of the scsi includes	2009-03-12 12:58:13 -05:00
scsicam.h
sg.h	[SCSI] sg: Add target reset support	2008-07-12 08:22:32 -05:00
srp.h