David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c		2008-12-02 19:50:27 -08:00
..
aacraid	[SCSI] aacraid: switch to block timeout	2008-12-01 11:15:16 -06:00
aic7xxx	[SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume	2008-10-23 11:42:16 -05:00
aic7xxx_old
aic94xx
arcmsr	x86: sysfs: kill owner field from attribute	2008-10-20 08:52:42 -07:00
arm
device_handler	[SCSI] scsi_dh: Initialize path state to be passive when path is not owned	2008-10-23 11:42:11 -05:00
dpt	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
ibmvscsi	[SCSI] ibmvscsi: switch to block timeout	2008-12-01 11:15:38 -06:00
libsas	Merge branch 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block	2008-10-10 10:52:45 -07:00
lpfc	[SCSI] lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events	2008-10-13 09:28:57 -04:00
megaraid	[SCSI] megaraid_sas: switch to block timeout	2008-12-01 11:15:55 -06:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
qla2xxx	[SCSI] qla2xxx: Update version number to 8.02.01-k9.	2008-11-05 12:42:29 -05:00
qla4xxx	drivers: replace NIPQUAD()	2008-10-31 00:56:00 -07:00
sym53c8xx_2	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
.gitignore
3w-9xxx.c	[SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API	2008-10-23 11:42:18 -05:00
3w-9xxx.h
3w-xxxx.c	[SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API	2008-10-23 11:42:17 -05:00
3w-xxxx.h
53c700_d.h_shipped
53c700.c
53c700.h
53c700.scr
a100u2w.c
a100u2w.h
a2091.c
a2091.h
a3000.c
a3000.h
a4000t.c
advansys.c	advansys fix on ISA-less configs	2008-11-30 10:03:36 -08:00
aha152x.c	drivers/scsi: use nr_irqs	2008-10-16 16:52:06 +02:00
aha152x.h
aha1542.c
aha1542.h
aha1740.c
aha1740.h
aic7xxx_old.c
atari_NCR5380.c
atari_scsi.c	m68k: Remove the broken Hades support	2008-10-14 10:23:27 -07:00
atari_scsi.h
atp870u.c
atp870u.h
BusLogic.c
BusLogic.h
bvme6000_scsi.c
ch.c	device create: scsi: convert device_create_drvdata to device_create	2008-10-16 09:24:44 -07:00
constants.c	[SCSI] scsi: add transport host byte errors (v3)	2008-10-13 09:28:48 -04:00
dc395x.c
dc395x.h
dmx3191d.c
dpt_i2o.c	[SCSI] dpt_i2o: fix transferred data length for scsi_set_resid()	2008-11-15 11:10:14 -06:00
dpti.h
dtc.c
dtc.h
eata_generic.h
eata_pio.c
eata_pio.h
eata.c
esp_scsi.c
esp_scsi.h	sparc: Kill SBUS DVMA layer.	2008-08-29 02:13:10 -07:00
fd_mcs.c
fdomain.c	fdomain_cs: Sort out modules with duplicate description	2008-10-17 23:07:38 +02:00
fdomain.h
FlashPoint.c
g_NCR5380_mmio.c
g_NCR5380.c
g_NCR5380.h
gdth_ioctl.h
gdth_proc.c	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
gdth_proc.h	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
gdth.c	gdth section fixes	2008-11-30 10:03:36 -08:00
gdth.h	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
gvp11.c
gvp11.h
hosts.c	[SCSI] scsi_host_lookup: error returns and NULL pointers	2008-10-03 11:46:12 -05:00
hptiop.c
hptiop.h
ibmmca.c
ide-scsi.c	[PATCH] switch ide-scsi	2008-10-21 07:48:46 -04:00
imm.c
imm.h
in2000.c
in2000.h
initio.c
initio.h
ipr.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-10-23 13:02:03 -07:00
ipr.h
ips.c	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
ips.h	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
iscsi_tcp.c	drivers: replace NIPQUAD()	2008-10-31 00:56:00 -07:00
iscsi_tcp.h
jazz_esp.c
Kconfig	m68k: Atari SCSI needs NVRAM	2008-10-14 10:23:27 -07:00
lasi700.c
libiscsi.c	libiscsi: fix locking in iscsi_eh_device_reset	2008-10-13 09:29:01 -04:00
libsrp.c
mac53c94.c
mac53c94.h
mac_esp.c
mac_scsi.c
mac_scsi.h
Makefile
megaraid.c	[SCSI] megaraid: fix mega_internal_command oops	2008-11-05 12:40:23 -05:00
megaraid.h	[SCSI] megaraid: fix mega_internal_command oops	2008-11-05 12:40:23 -05:00
mesh.c
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
mvsas.c
ncr53c8xx.c	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
ncr53c8xx.h
NCR53c406a.c
NCR5380.c
NCR5380.h
NCR_D700.c
NCR_D700.h
NCR_Q720.c
NCR_Q720.h
nsp32_debug.c
nsp32_io.h
nsp32.c	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
nsp32.h	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
osst_detect.h
osst_options.h
osst.c	device create: scsi: convert device_create_drvdata to device_create	2008-10-16 09:24:44 -07:00
osst.h
pas16.c
pas16.h
ppa.c
ppa.h
ps3rom.c
ql1040_fw.h
ql1280_fw.h
ql12160_fw.h
qla1280.c	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
qla1280.h
qlogicfas408.c
qlogicfas408.h
qlogicfas.c
qlogicpti_asm.c
qlogicpti.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
qlogicpti.h	qlogicpti: Convert to pure OF driver.	2008-08-29 02:14:46 -07:00
raid_class.c
script_asm.pl
scsi_debug.c
scsi_devinfo.c
scsi_error.c	[SCSI] make scsi_eh_try_stu use block timeout	2008-12-01 11:16:09 -06:00
scsi_ioctl.c	[PATCH] don't mess with file in scsi_nonblockable_ioctl()	2008-10-21 07:47:28 -04:00
scsi_lib_dma.c
scsi_lib.c	[SCSI] Fix hang in starved list processing	2008-11-16 08:13:58 -06:00
scsi_logging.h
scsi_module.c
scsi_netlink.c	[SCSI] fix netlink kernel-doc	2008-10-23 11:42:17 -05:00
scsi_priv.h	[SCSI] modify scsi to handle new fail fast flags.	2008-10-13 09:28:52 -04:00
scsi_proc.c	[SCSI] scsi_host_lookup: error returns and NULL pointers	2008-10-03 11:46:12 -05:00
scsi_sas_internal.h
scsi_scan.c	[SCSI] Add helper code so transport classes/driver can control queueing (v3)	2008-10-13 09:28:46 -04:00
scsi_sysctl.c
scsi_sysfs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-10-10 10:53:26 -07:00
scsi_tgt_if.c
scsi_tgt_lib.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-10-10 10:53:26 -07:00
scsi_tgt_priv.h
scsi_transport_api.h
scsi_transport_fc_internal.h
scsi_transport_fc.c	[SCSI] fc class: unblock target after calling terminate callback (take 2)	2008-10-13 09:28:47 -04:00
scsi_transport_iscsi.c	[SCSI] iscsi class: fix endpoint id handling	2008-10-13 09:28:59 -04:00
scsi_transport_sas.c
scsi_transport_spi.c	[SCSI] block: separate failfast into multiple bits.	2008-10-13 09:28:52 -04:00
scsi_transport_srp_internal.h
scsi_transport_srp.c
scsi_typedefs.h
scsi_wait_scan.c
scsi.c	[SCSI] Add helper code so transport classes/driver can control queueing (v3)	2008-10-13 09:28:46 -04:00
scsi.h
scsicam.c
sd_dif.c	[SCSI] sd: Switch kernel printing level for DIF messages	2008-10-13 09:28:58 -04:00
sd.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-10-23 13:02:03 -07:00
sd.h	[SCSI] sd: fix compile failure with CONFIG_BLK_DEV_INTEGRITY=n	2008-10-15 08:41:28 -04:00
ses.c
sg.c	saner FASYNC handling on file close	2008-11-01 09:49:46 -07:00
sgiwd93.c
sim710.c
sni_53c710.c
sr_ioctl.c
sr_vendor.c	drivers/scsi/sr_vendor.c: use bcd2bin	2008-10-20 08:52:41 -07:00
sr.c	[PATCH] switch sr	2008-10-21 07:48:50 -04:00
sr.h
st_options.h
st.c	[PATCH] don't mess with file in scsi_nonblockable_ioctl()	2008-10-21 07:47:28 -04:00
st.h
stex.c	[SCSI] stex: switch to block timeout	2008-12-01 11:16:27 -06:00
sun3_NCR5380.c
sun3_scsi_vme.c
sun3_scsi.c
sun3_scsi.h
sun3x_esp.c	[SCSI] sun3x_esp: Convert && to ||	2008-10-23 11:42:19 -05:00
sun_esp.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c	[SCSI] tmscsim: Fixup KERN_INFO in printk	2008-10-03 11:46:12 -05:00
tmscsim.h
u14-34f.c
ultrastor.c
ultrastor.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c