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
..
at91_cf.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
au1000_generic.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
au1000_generic.h	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
au1000_pb1x00.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
bcm63xx_pcmcia.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
cardbus.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
cirrus.h
cistpl.c	pcmcia: move local definitions out of include/pcmcia/cs.h	2010-08-03 09:04:13 +02:00
cs_internal.h	pcmcia: insert PCMCIA device resources into resource tree	2010-08-03 09:04:19 +02:00
cs.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
db1xxx_ss.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
ds.c	pcmcia: insert PCMCIA device resources into resource tree	2010-08-03 09:04:19 +02:00
electra_cf.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
i82092.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
i82092aa.h
i82365.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
i82365.h	pcmcia: honor saved flags in yenta_socket's I365_CSCINT register	2010-03-15 14:50:15 +01:00
Kconfig	MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY	2010-08-05 13:26:06 +01:00
m8xx_pcmcia.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
m32r_cfc.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
m32r_cfc.h
m32r_pcc.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
m32r_pcc.h
Makefile	pcmcia: remove obsolete ioctl	2010-07-30 21:07:26 +02:00
o2micro.h	pcmcia/yenta: add module parameter for O2 speedups	2010-02-17 17:37:35 +01:00
omap_cf.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
pcmcia_cis.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
pcmcia_resource.c	pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq	2010-08-03 16:43:13 +02:00
pd6729.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
pd6729.h
pxa2xx_base.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c
pxa2xx_cm_x270.c
pxa2xx_e740.c
pxa2xx_lubbock.c
pxa2xx_mainstone.c
pxa2xx_palmld.c
pxa2xx_palmtc.c
pxa2xx_palmtx.c
pxa2xx_sharpsl.c
pxa2xx_stargate2.c
pxa2xx_trizeps4.c
pxa2xx_viper.c
pxa2xx_vpac270.c	[ARM] pxa: add support for Voipac PXA270 PCMCIA	2010-05-11 17:25:02 +02:00
ricoh.h
rsrc_iodyn.c	pcmcia: insert PCMCIA device resources into resource tree	2010-08-03 09:04:19 +02:00
rsrc_mgr.c	pcmcia: insert PCMCIA device resources into resource tree	2010-08-03 09:04:19 +02:00
rsrc_nonstatic.c	pcmcia: insert PCMCIA device resources into resource tree	2010-08-03 09:04:19 +02:00
sa11xx_base.c	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02:00
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c
sa1100_cerf.c
sa1100_generic.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sa1111_generic.h
soc_common.c
soc_common.h	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
socket_sysfs.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
tcic.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
tcic.h
ti113x.h	pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary	2010-03-15 14:50:16 +01:00
topic.h
vg468.h
vrc4171_card.c	pcmcia: use dev_pm_ops for class pcmcia_socket_class	2010-03-24 11:00:11 +01:00
vrc4173_cardu.c
vrc4173_cardu.h
xxs1500_ss.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
yenta_socket.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
yenta_socket.h