Jeff Garzik 8407884dd9 Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream ...

Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h

2012-07-25 15:58:48 -04:00

..

fc

…

fc_encode.h

…

fc_frame.h

…

fcoe_sysfs.h

[SCSI] libfcoe: Add fcoe_sysfs

2012-05-23 09:40:09 +01:00

iscsi_if.h

…

iscsi_proto.h

…

Kbuild

…

libfc.h

[SCSI] libfc: update fcp and exch stats

2012-07-20 08:31:48 +01:00

libfcoe.h

[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs

2012-05-23 09:43:13 +01:00

libiscsi_tcp.h

…

libiscsi.h

…

libsas.h

[SCSI] libsas: trim sas_task of slow path infrastructure

2012-07-20 08:58:54 +01:00

libsrp.h

…

osd_attributes.h

…

osd_initiator.h

…

osd_ore.h

…

osd_protocol.h

…

osd_sec.h

…

osd_sense.h

…

osd_types.h

…

sas_ata.h

[SCSI] libata, libsas: introduce sched_eh and end_eh port ops

2012-07-20 08:58:45 +01:00

sas.h

…

scsi_bsg_fc.h

…

scsi_bsg_iscsi.h

…

scsi_cmnd.h

[SCSI] Fix NULL dereferences in scsi_cmd_to_driver

2012-07-08 09:40:51 +01:00

scsi_dbg.h

…

scsi_device.h

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

2012-07-25 15:58:48 -04:00

scsi_devinfo.h

…

scsi_dh.h

[SCSI] scsi_dh: add scsi_dh_attached_handler_name

2012-07-20 08:58:42 +01:00

scsi_driver.h

…

scsi_eh.h

…

scsi_host.h

…

scsi_ioctl.h

…

scsi_netlink_fc.h

…

scsi_netlink.h

…

scsi_tcq.h

…

scsi_tgt_if.h

…

scsi_tgt.h

…

scsi_transport_fc.h

[SCSI] fc: add some more FC specific stats to fc_host

2012-07-20 08:31:47 +01:00

scsi_transport_iscsi.h

…

scsi_transport_sas.h

…

scsi_transport_spi.h

…

scsi_transport_srp.h

…

scsi_transport.h

…

scsi.h

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

2012-07-25 15:58:48 -04:00

scsicam.h

…

sg.h

…

srp.h

…