Linus Torvalds 1685e633b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes		2010-08-06 12:25:06 -07:00
..
aacraid	[SCSI] aacraid: Do not set DMA mask to 32 bit first if adapter only supports 31	2010-07-28 09:06:19 -05:00
aic7xxx	[SCSI] aic7xxx: Remove OS utility wrappers	2010-07-28 09:05:27 -05:00
aic7xxx_old	fix comnment/printk typos concerning "empty"	2010-07-12 18:03:50 +02:00
aic94xx	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
arcmsr	scsi: Remove owner field from attribute initialization in ARCMSR driver	2010-08-05 13:53:35 -07:00
arm
be2iscsi	[SCSI] scsi: add Kconfig dependency on NET	2010-07-28 09:05:38 -05:00
bfa	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
bnx2i	[SCSI] bnx2i: Updated version from 2.1.1 to 2.1.2	2010-07-27 12:04:02 -05:00
cxgb3i	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-04 15:15:15 -07:00
device_handler	[SCSI] scsi_dh_rdac: Add Dell MD36xxi controller into RDAC device list	2010-07-28 09:05:43 -05:00
dpt
fcoe	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
fnic	[SCSI] libfcoe: fcoe: fnic: add FIP VN2VN point-to-multipoint support	2010-07-28 09:05:56 -05:00
ibmvscsi	[SCSI] ibmvstgt: add __init/__exit macros	2010-07-28 09:07:04 -05:00
libfc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
libsas	[SCSI] Unify SAM_ and SAM_STAT_ macros	2010-07-28 09:07:49 -05:00
lpfc	scsi: Remove owner field from attribute initialization in LPFC driver	2010-08-05 13:53:35 -07:00
megaraid
mpt2sas	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
mvsas	[SCSI] Unify SAM_ and SAM_STAT_ macros	2010-07-28 09:07:49 -05:00
osd
pcmcia	pcmcia: remove memreq_t	2010-08-03 09:04:14 +02:00
pm8001	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
qla2xxx	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
qla4xxx	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
sym53c8xx_2
.gitignore
3w-9xxx.c
3w-9xxx.h
3w-sas.c
3w-sas.h
3w-xxxx.c
3w-xxxx.h
53c700_d.h_shipped
53c700.c
53c700.h
53c700.scr
a100u2w.c
a100u2w.h
a2091.c	m68k/scsi: a2091 - Do not use legacy Scsi_Host.base	2010-05-26 19:51:08 +02:00
a2091.h	m68k/scsi: a2091 - Kill a2091_scsiregs typedef	2010-05-26 19:51:07 +02:00
a3000.c	m68k/scsi: a3000 - Do not use legacy Scsi_Host.base	2010-05-26 19:51:08 +02:00
a3000.h	m68k/scsi: a3000 - Kill a3000_scsiregs typedef	2010-05-26 19:51:07 +02:00
a4000t.c	m68k: amiga - A4000T SCSI platform device conversion	2010-05-26 19:51:09 +02:00
advansys.c	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02: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
atp870u.h
BusLogic.c
BusLogic.h
bvme6000_scsi.c
ch.c
constants.c
dc395x.c
dc395x.h
dmx3191d.c
dpt_i2o.c	[SCSI] dpt_i2o: move range check forward	2010-07-28 09:05:43 -05:00
dpti.h
dtc.c
dtc.h
eata_generic.h
eata_pio.c
eata_pio.h
eata.c
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
gdth_proc.h
gdth.c
gdth.h
gvp11.c	m68k/scsi: gvp11 - Do not use legacy Scsi_Host.base	2010-05-26 19:51:08 +02:00
gvp11.h	m68k: amiga - GVP Series II SCSI zorro_driver conversion	2010-05-26 19:51:08 +02:00
hosts.c	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
hpsa_cmd.h	[SCSI] hpsa: Fix hard reset code.	2010-07-27 12:02:00 -05:00
hpsa.c	[SCSI] hpsa: sanitize max commands	2010-07-27 12:02:03 -05:00
hpsa.h	[SCSI] hpsa: remove unused firm_ver member of the per-hba structure	2010-07-27 12:01:15 -05:00
hptiop.c	[SCSI] hptiop: Eliminate a NULL pointer dereference	2010-07-27 12:01:01 -05:00
hptiop.h
ibmmca.c
imm.c
imm.h
in2000.c
in2000.h
initio.c
initio.h
ipr.c	[SCSI] ipr: fix resource type update and add sdev and shost attributes	2010-07-28 09:05:40 -05:00
ipr.h	[SCSI] ipr: change endian swap key to match hardware spec change	2010-07-27 12:03:55 -05:00
ips.c
ips.h
iscsi_tcp.c
iscsi_tcp.h
jazz_esp.c
Kconfig	[SCSI] zfcp: Introduce experimental support for DIF/DIX	2010-07-28 09:48:56 -05:00
lasi700.c
libiscsi_tcp.c
libiscsi.c
libsrp.c
mac53c94.c	powerpc/macio: Fix probing of macio devices by using the right of match table	2010-06-02 17:50:38 +10:00
mac53c94.h
mac_esp.c
mac_scsi.c
mac_scsi.h
Makefile	[SCSI] convert to the new PM framework	2010-07-28 09:07:49 -05:00
megaraid.c
megaraid.h
mesh.c	powerpc/macio: Fix probing of macio devices by using the right of match table	2010-06-02 17:50:38 +10:00
mesh.h
mvme16x_scsi.c
mvme147.c	m68k/scsi: mvme147 - Kill obsolete HOSTS_C logic	2010-05-26 19:51:07 +02:00
mvme147.h
ncr53c8xx.c
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
nsp32.h
osst_detect.h
osst_options.h
osst.c	osst: use noop_llseek() instead of default_llseek()	2010-05-27 09:12:56 -07:00
osst.h
pas16.c
pas16.h
pmcraid.c	[SCSI] pmcraid : Remove unnecessary casts for void * pointers	2010-07-28 09:05:26 -05:00
pmcraid.h	[SCSI] pmcraid: MSI-X support and other changes	2010-07-27 12:01:35 -05:00
ppa.c
ppa.h
ps3rom.c
qla1280.c
qla1280.h
qlogicfas408.c
qlogicfas408.h
qlogicfas.c
qlogicpti.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
qlogicpti.h
raid_class.c
script_asm.pl
scsi_debug.c	[SCSI] scsi_debug: fix map_region and unmap_region oops	2010-07-27 12:03:55 -05:00
scsi_devinfo.c
scsi_error.c	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
scsi_ioctl.c
scsi_lib_dma.c
scsi_lib.c
scsi_logging.h
scsi_module.c
scsi_netlink.c
scsi_pm.c	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
scsi_priv.h	SCSI: remove fake "address-of" expression	2010-08-06 09:17:02 -07:00
scsi_proc.c
scsi_sas_internal.h
scsi_scan.c	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
scsi_sysctl.c
scsi_sysfs.c	SCSI: remove fake "address-of" expression	2010-08-06 09:17:02 -07:00
scsi_tgt_if.c
scsi_tgt_lib.c
scsi_tgt_priv.h
scsi_trace.c
scsi_transport_api.h
scsi_transport_fc_internal.h
scsi_transport_fc.c	fix typos concerning "hierarchy"	2010-06-16 18:03:14 +02:00
scsi_transport_iscsi.c	[SCSI] iscsi_transport: wait on session in error handler path	2010-07-28 09:06:06 -05:00
scsi_transport_sas.c
scsi_transport_spi.c
scsi_transport_srp_internal.h
scsi_transport_srp.c
scsi_typedefs.h
scsi_wait_scan.c
scsi.c
scsi.h
scsicam.c
sd_dif.c
sd.c	[SCSI] sd: add support for runtime PM	2010-07-28 09:07:50 -05:00
sd.h
ses.c
sg.c	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
sgiwd93.c
sim710.c
sni_53c710.c
sr_ioctl.c
sr_vendor.c
sr.c
sr.h
st_options.h
st.c	st: use noop_llseek() instead of default_llseek()	2010-05-27 09:12:56 -07:00
st.h
stex.c
sun3_NCR5380.c
sun3_scsi_vme.c
sun3_scsi.c
sun3_scsi.h
sun3x_esp.c
sun_esp.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c
tmscsim.h
u14-34f.c
ultrastor.c
ultrastor.h
vmw_pvscsi.c
vmw_pvscsi.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c