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
..
aacraid	[SCSI] aacraid: Series 7 Async. (performance) mode support	2012-07-20 08:59:04 +01:00
aic7xxx
aic7xxx_old
aic94xx
arcmsr	[SCSI] arcmsr: fix misuse of | instead of &	2012-07-20 08:58:31 +01:00
arm
be2iscsi
bfa	[SCSI] bfa: Fix to set correct return error codes and misc cleanup.	2012-07-20 08:59:05 +01:00
bnx2fc	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
bnx2i
cxgbi	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
device_handler	[SCSI] scsi_dh: add scsi_dh_attached_handler_name	2012-07-20 08:58:42 +01:00
dpt
fcoe	[SCSI] fcoe: Cleanup locking on fcoe_percpu_receive_thread	2012-07-20 08:58:55 +01:00
fnic
ibmvscsi
isci	[SCSI] isci: use sas eh strategy handlers	2012-07-20 08:58:51 +01:00
libfc	[SCSI] libfc: fix sending REC after FCP_RESP is received	2012-07-20 08:58:56 +01:00
libsas	[SCSI] async: introduce 'async_domain' type	2012-07-20 09:05:54 +01:00
lpfc	[SCSI] lpfc: fix problems with -Werror	2012-07-20 08:58:54 +01:00
megaraid	[SCSI] megaraid: remove a spurious IRQ enable	2012-07-20 08:58:39 +01:00
mpt2sas	[SCSI] core, classes, mpt2sas: have scsi_internal_device_unblock take new state	2012-07-20 08:58:22 +01:00
mvsas	[SCSI] mvsas: remove unused variable in mvs_task_exec()	2012-07-20 08:58:54 +01:00
osd
pcmcia
pm8001	[SCSI] libsas: trim sas_task of slow path infrastructure	2012-07-20 08:58:54 +01:00
qla2xxx	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
qla4xxx	[SCSI] qla4xxx: remove unnecessary read of PCI_CAP_ID_EXP	2012-07-20 08:59:02 +01:00
sym53c8xx_2
ufs	[SCSI] ufs: fix incorrect return value about SUCCESS and FAILED	2012-07-20 08:59:02 +01:00
.gitignore
3w-9xxx.c
3w-9xxx.h
3w-sas.c
3w-sas.h
3w-xxxx.c
3w-xxxx.h
53c700.c
53c700.h
53c700.scr
53c700_d.h_shipped
a100u2w.c
a100u2w.h
a2091.c
a2091.h
a3000.c
a3000.h
a4000t.c
advansys.c
aha152x.c	scsi: aha152x: Fix sparse warning and make printing pointer address more portable.	2012-07-20 10:19:25 +02:00
aha152x.h
aha1542.c
aha1542.h
aha1740.c
aha1740.h
aic7xxx_old.c
atari_NCR5380.c
atari_scsi.c
atari_scsi.h
atp870u.c
atp870u.h
BusLogic.c
BusLogic.h
bvme6000_scsi.c
ch.c
constants.c
dc395x.c
dc395x.h
dmx3191d.c
dpt_i2o.c
dpti.h
dtc.c
dtc.h
eata.c
eata_generic.h
eata_pio.c
eata_pio.h
esp_scsi.c
esp_scsi.h
fdomain.c
fdomain.h
FlashPoint.c
g_NCR5380.c
g_NCR5380.h
g_NCR5380_mmio.c
gdth.c
gdth.h
gdth_ioctl.h
gdth_proc.c
gdth_proc.h
gvp11.c
gvp11.h
hosts.c	[SCSI] Fix device removal NULL pointer dereference	2012-07-20 08:58:40 +01:00
hpsa.c
hpsa.h
hpsa_cmd.h
hptiop.c	[SCSI] hptiop: fix RR312x in hosts with >12GB	2012-07-20 08:58:30 +01:00
hptiop.h	[SCSI] hptiop: fix RR312x in hosts with >12GB	2012-07-20 08:58:30 +01:00
imm.c
imm.h
in2000.c
in2000.h
initio.c
initio.h
ipr.c
ipr.h
ips.c
ips.h
iscsi_boot_sysfs.c
iscsi_tcp.c
iscsi_tcp.h
jazz_esp.c
Kconfig	[SCSI] aha152x: Allow use on 64bit systems	2012-07-20 08:59:04 +01:00
lasi700.c
libiscsi.c
libiscsi_tcp.c
libsrp.c
mac53c94.c
mac53c94.h
mac_esp.c
mac_scsi.c
mac_scsi.h
Makefile	[SCSI] Remove scsi_wait_scan module	2012-07-20 08:58:13 +01:00
megaraid.c	[SCSI] megaraid: cleanup type issue in mega_build_cmd()	2012-07-20 08:58:38 +01:00
megaraid.h
mesh.c
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
mvumi.c
mvumi.h
ncr53c8xx.c
ncr53c8xx.h
NCR53c406a.c
NCR5380.c
NCR5380.h
NCR_D700.c
NCR_D700.h
NCR_Q720.c
NCR_Q720.h
nsp32.c
nsp32.h
nsp32_debug.c
nsp32_io.h
osst.c
osst.h
osst_detect.h
osst_options.h
pas16.c
pas16.h
pmcraid.c
pmcraid.h
ppa.c
ppa.h
ps3rom.c
qla1280.c
qla1280.h
qlogicfas.c
qlogicfas408.c
qlogicfas408.h
qlogicpti.c
qlogicpti.h
raid_class.c
script_asm.pl
scsi.c	[SCSI] async: make async_synchronize_full() flush all work regardless of domain	2012-07-20 09:07:37 +01:00
scsi.h
scsi_debug.c
scsi_devinfo.c
scsi_error.c	[SCSI] cleanup setting task state in scsi_error_handler()	2012-07-20 08:58:47 +01:00
scsi_ioctl.c
scsi_lib.c	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
scsi_lib_dma.c
scsi_logging.h
scsi_module.c
scsi_netlink.c
scsi_pm.c	[SCSI] scsi_pm: set device runtime state before parent suspended	2012-07-20 08:58:55 +01:00
scsi_priv.h	[SCSI] async: introduce 'async_domain' type	2012-07-20 09:05:54 +01:00
scsi_proc.c
scsi_sas_internal.h
scsi_scan.c	[SCSI] Revert "[SCSI] fix async probe regression"	2012-07-20 09:25:56 +01:00
scsi_sysctl.c
scsi_sysfs.c	[SCSI] fix hot unplug vs async scan race	2012-07-20 08:58:45 +01:00
scsi_tgt_if.c
scsi_tgt_lib.c
scsi_tgt_priv.h
scsi_trace.c
scsi_transport_api.h
scsi_transport_fc.c	[SCSI] core, classes, mpt2sas: have scsi_internal_device_unblock take new state	2012-07-20 08:58:22 +01:00
scsi_transport_fc_internal.h
scsi_transport_iscsi.c	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
scsi_transport_sas.c
scsi_transport_spi.c
scsi_transport_srp.c
scsi_transport_srp_internal.h
scsi_typedefs.h
scsicam.c
sd.c	[SCSI] set to WCE if usb cache quirk is present.	2012-07-20 08:59:00 +01:00
sd.h
sd_dif.c
ses.c
sg.c
sgiwd93.c
sim710.c
sni_53c710.c
sr.c
sr.h
sr_ioctl.c
sr_vendor.c
st.c
st.h
st_options.h
stex.c
storvsc_drv.c
sun3_NCR5380.c
sun3_scsi.c
sun3_scsi.h
sun3_scsi_vme.c
sun3x_esp.c
sun_esp.c
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c
tmscsim.h
u14-34f.c
ultrastor.c
ultrastor.h
virtio_scsi.c	[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning	2012-07-20 08:59:03 +01:00
vmw_pvscsi.c
vmw_pvscsi.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c