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
..
aacraid	Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)	2009-04-13 15:04:33 -07:00
aic7xxx	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
aic7xxx_old
aic94xx	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
arcmsr	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
arm
bnx2i	[SCSI] bnx2i: Add bnx2i iSCSI driver.	2009-06-09 10:22:45 -05:00
cxgb3i	[SCSI] cxgb3i: Include net/dst.h for struct dst_cache	2009-06-08 13:09:33 -05:00
device_handler	[SCSI] scsi_dh_rdac: Retry for NOT_READY(02/04/01) in rdac device handler	2009-05-20 17:21:14 -05:00
dpt	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
fcoe	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
fnic	[SCSI] libfc,fcoe,fnic: Separate rport and lport max retry counts	2009-05-23 15:44:18 -05:00
ibmvscsi	[SCSI] ibmvscsi: Add support for capabilities MAD	2009-06-08 18:05:21 -05:00
libfc	[SCSI] libfc: Check if exchange is completed when receiving a sequence	2009-06-08 13:29:11 -05:00
libsas	block: set rq->resid_len to blk_rq_bytes() on issue	2009-05-19 11:36:08 +02:00
lpfc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
megaraid	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
mpt2sas	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05:00
mvsas	[SCSI] mvsas: remove all the casts from void * or to void *	2009-05-23 15:44:13 -05:00
osd	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05:00
pcmcia
qla2xxx	[SCSI] qla2xxx: Update version number to 8.03.01-k3.	2009-06-08 14:47:02 -05:00
qla4xxx	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
sym53c8xx_2	[SCSI] sym53c8xx_2: slave_alloc/destroy safety (2.6.27.5)	2009-05-20 17:21:14 -05:00
.gitignore
3w-9xxx.c	[SCSI] 3w-9xxx: scsi_dma_unmap fix	2009-05-15 12:23:32 -04:00
3w-9xxx.h
3w-xxxx.c	[SCSI] 3w-xxxx: scsi_dma_unmap fix	2009-05-15 12:24:59 -04:00
3w-xxxx.h	[SCSI] 3w-xxxx: scsi_dma_unmap fix	2009-05-15 12:24:59 -04:00
53c700_d.h_shipped
53c700.c
53c700.h
53c700.scr
a100u2w.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
a100u2w.h
a2091.c	[SCSI] a2091: make 2 functions static	2009-04-03 10:17:31 -05:00
a2091.h	[SCSI] a2091: make 2 functions static	2009-04-03 10:17:31 -05:00
a3000.c	[SCSI] a3000: make 2 functions static	2009-04-03 10:17:17 -05:00
a3000.h	[SCSI] a3000: make 2 functions static	2009-04-03 10:17:17 -05:00
a4000t.c	scsi: a4000 - Correct driver unregistration in case of failure	2009-04-22 20:39:06 +02:00
advansys.c	[SCSI] advansys: use request_firmware	2009-04-03 09:25:23 -05:00
aha152x.c
aha152x.h
aha1542.c
aha1542.h
aha1740.c
aha1740.h
aic7xxx_old.c
atari_NCR5380.c
atari_scsi.c
atari_scsi.h
atp870u.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
atp870u.h
BusLogic.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
BusLogic.h
bvme6000_scsi.c
ch.c
constants.c
dc395x.c
dc395x.h
dmx3191d.c
dpt_i2o.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
dpti.h
dtc.c
dtc.h
eata_generic.h
eata_pio.c
eata_pio.h
eata.c	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
esp_scsi.c
esp_scsi.h
fd_mcs.c
fdomain.c
fdomain.h
FlashPoint.c
g_NCR5380_mmio.c
g_NCR5380.c
g_NCR5380.h
gdth_ioctl.h
gdth_proc.c	[SCSI] gdth: fix overlapping snprintf users	2009-06-09 10:31:46 -05:00
gdth_proc.h
gdth.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
gdth.h
gvp11.c
gvp11.h
hosts.c
hptiop.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
hptiop.h
ibmmca.c
imm.c
imm.h
in2000.c
in2000.h
initio.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
initio.h
ipr.c	[SCSI] ipr: fix PCI permanent error handler	2009-05-23 15:44:07 -05:00
ipr.h
ips.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
ips.h
iscsi_tcp.c	[SCSI] cxgb3i, iser, iscsi_tcp: set target can queue	2009-04-27 10:09:54 -05:00
iscsi_tcp.h
jazz_esp.c
Kconfig	[SCSI] bnx2i: Add bnx2i iSCSI driver.	2009-06-09 10:22:45 -05:00
lasi700.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
libiscsi_tcp.c	[SCSI] libiscsi: add task aborted state	2009-05-23 15:44:13 -05:00
libiscsi.c	[SCSI] libiscsi: add debug printks for iscsi command completion path	2009-05-23 15:44:13 -05:00
libsrp.c
mac53c94.c
mac53c94.h
mac_esp.c
mac_scsi.c
mac_scsi.h
Makefile	[SCSI] bnx2i: Add bnx2i iSCSI driver.	2009-06-09 10:22:45 -05:00
megaraid.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
megaraid.h	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
mesh.c
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
ncr53c8xx.c
ncr53c8xx.h
NCR53c406a.c
NCR5380.c
NCR5380.h
NCR_D700.c	[SCSI] NCR_D700: fix IRQ handler return type	2009-05-23 15:44:09 -05:00
NCR_D700.h
NCR_Q720.c
NCR_Q720.h
nsp32_debug.c
nsp32_io.h
nsp32.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
nsp32.h
osst_detect.h
osst_options.h
osst.c
osst.h
pas16.c
pas16.h
ppa.c
ppa.h
ps3rom.c
qla1280.c	[SCSI] qla1280: error recovery rewrite	2009-05-20 17:21:13 -05:00
qla1280.h	[SCSI] qla1280: error recovery rewrite	2009-05-20 17:21:13 -05:00
qlogicfas408.c
qlogicfas408.h
qlogicfas.c
qlogicpti.c	[SCSI] qlogicpti: use request_firmware	2009-04-03 09:25:23 -05:00
qlogicpti.h
raid_class.c
script_asm.pl
scsi_debug.c	[SCSI] scsi_debug: fix virtual disk larger than 1TB	2009-05-20 17:21:15 -05:00
scsi_devinfo.c	proc 2/2: remove struct proc_dir_entry::owner	2009-03-31 01:14:44 +04:00
scsi_error.c	[SCSI] fix up scsi_eh_lock_door()	2009-06-08 12:47:40 -05:00
scsi_ioctl.c
scsi_lib_dma.c
scsi_lib.c	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05:00
scsi_logging.h
scsi_module.c
scsi_netlink.c
scsi_priv.h	PM/Hibernate: Wait for SCSI devices scan to complete during resume	2009-04-13 11:37:07 -07:00
scsi_proc.c	proc 2/2: remove struct proc_dir_entry::owner	2009-03-31 01:14:44 +04:00
scsi_sas_internal.h
scsi_scan.c	[SCSI] Increase default timeout for INQUIRY	2009-05-20 17:21:13 -05:00
scsi_sysctl.c
scsi_sysfs.c
scsi_tgt_if.c
scsi_tgt_lib.c	block: cleanup rq->data_len usages	2009-05-11 09:50:55 +02:00
scsi_tgt_priv.h
scsi_transport_api.h
scsi_transport_fc_internal.h
scsi_transport_fc.c
scsi_transport_iscsi.c	[SCSI] iscsi class: Add new NETLINK_ISCSI messages for cnic/bnx2i driver.	2009-06-09 10:22:35 -05:00
scsi_transport_sas.c	block: implement and enforce request peek/start/fetch	2009-05-11 09:52:18 +02:00
scsi_transport_spi.c
scsi_transport_srp_internal.h
scsi_transport_srp.c
scsi_typedefs.h
scsi_wait_scan.c	driver synchronization: make scsi_wait_scan more advanced	2009-04-21 19:40:00 -07:00
scsi.c	[SCSI] fix documentation for two functions	2009-06-08 12:23:35 -05:00
scsi.h
scsicam.c
sd_dif.c	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
sd.c	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05:00
sd.h
ses.c	[SCSI] ses: #if 0 the unused ses_match_host()	2009-04-03 10:17:01 -05:00
sg.c	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
sgiwd93.c
sim710.c
sni_53c710.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
sr_ioctl.c	[SCSI] sr: report more accurate drive status after closing the tray.	2009-04-27 09:32:30 -05:00
sr_vendor.c
sr.c	block: Do away with the notion of hardsect_size	2009-05-22 23:22:54 +02:00
sr.h
st_options.h
st.c	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05:00
st.h
stex.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
sun3_NCR5380.c
sun3_scsi_vme.c
sun3_scsi.c
sun3_scsi.h
sun3x_esp.c
sun_esp.c
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c
tmscsim.h
u14-34f.c	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
ultrastor.c
ultrastor.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c