Linus Torvalds f33c596a2f 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: smc91c92_cs.c: fix bogus compiler warning orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002 hostap_cs: support cards with "Version 01.02" as third product ID pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3 pxa2xx pcmcia - stargate 2 use gpio array. pcmcia: pxa2xx: remove empty socket_init / socket_resume functions. drivers:pcmcia:soc_common: make socket_init and socket_suspend optional		2011-07-31 06:23:08 -10:00
..
at91_cf.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
au1000_generic.c
au1000_generic.h
au1000_pb1x00.c
bcm63xx_pcmcia.c
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
cardbus.c
cirrus.h
cistpl.c
cs.c
cs_internal.h
db1xxx_ss.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
ds.c	pcmcia: Make declaration and uses of struct pcmcia_device_id const	2011-05-06 07:46:15 +02:00
electra_cf.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
i82092.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
i82092aa.h
i82365.c
i82365.h
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
m8xx_pcmcia.c	dt: Eliminate of_platform_{,un}register_driver	2011-02-28 13:22:46 -07:00
m32r_cfc.c
m32r_cfc.h
m32r_pcc.c
m32r_pcc.h
Makefile
o2micro.h
omap_cf.c
pcmcia_cis.c
pcmcia_resource.c	Revert wrong fixes for common misspellings	2011-04-26 23:31:11 -07:00
pd6729.c
pd6729.h
pxa2xx_balloon3.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_base.c	pcmcia vs. MECR on pxa25x/sa1111	2011-02-19 12:22:35 +01:00
pxa2xx_base.h	pcmcia vs. MECR on pxa25x/sa1111	2011-02-19 12:22:35 +01:00
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_cm_x270.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_colibri.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_e740.c
pxa2xx_lubbock.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
pxa2xx_mainstone.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_palmld.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_palmtc.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_palmtx.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_sharpsl.c	ARM: scoop: drop pcmcia_init callback	2011-07-11 14:43:32 +08:00
pxa2xx_stargate2.c	pxa2xx pcmcia - stargate 2 use gpio array.	2011-07-29 17:55:15 +02:00
pxa2xx_trizeps4.c	pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefs	2011-07-11 14:43:33 +08:00
pxa2xx_viper.c	pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.	2011-07-29 17:55:13 +02:00
pxa2xx_vpac270.c	pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting	2011-07-11 14:26:34 +08:00
ricoh.h
rsrc_iodyn.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
rsrc_mgr.c
rsrc_nonstatic.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c
sa1100_cerf.c
sa1100_generic.c	pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data	2011-05-06 07:46:11 +02:00
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_nanoengine.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c
sa1111_generic.h
soc_common.c	drivers:pcmcia:soc_common: make socket_init and socket_suspend optional	2011-07-29 17:55:10 +02:00
soc_common.h
socket_sysfs.c
tcic.c
tcic.h
ti113x.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
xxs1500_ss.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
yenta_socket.c
yenta_socket.h