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
..
ciscode.h
cisreg.h
cistpl.h
device_id.h	pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3	2011-07-29 17:56:08 +02:00
ds.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ss.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00