Linus Torvalds 86dca4f8e6 Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (33 commits) [PATCH] pcmcia: declare pccard_iodyn_ops (fix m8xx_pcmcia.c compilation error) [PATCH] pcmcia: fix pcmcia_device_remove oops [PATCH] pcmcia: Add support for Possio GCC AKA PCMCIA Siemens MC45 [PATCH] pcmcia: pseudo device handling update [PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present [PATCH] pcmcia: use bitfield instead of p_state and state [PATCH] pcmcia: remove unused p_dev->state flags [PATCH] pcmcia: make pcmcia_release_{io,irq} static [PATCH] pcmcia: add return value to _config() functions [PATCH] pcmcia: remove dev_link_t and client_handle_t indirection [PATCH] pcmcia: embed dev_link_t into struct pcmcia_device [PATCH] pcmcia: rename pcmcia_device.state [PATCH] pcmcia: remove unneeded Vcc pseudo setting [PATCH] pcmcia: remove export of pcmcia_release_configuration [PATCH] pcmcia: default suspend and resume handling [PATCH] pcmcia: convert remaining users of pcmcia_release_io and _irq [PATCH] pcmcia: add pcmcia_disable_device [PATCH] serial_cs: add Merlin U630 IDs [PATCH] pcmcia: AT91RM9200 Compact Flash driver [PATCH] pcmcia: socket.functions starts with 1 ...		2006-04-02 12:49:59 -07:00
..
at91_cf.c	[PATCH] pcmcia: AT91RM9200 Compact Flash driver	2006-03-31 17:05:41 +02:00
au1000_db1x00.c
au1000_generic.c
au1000_generic.h
au1000_pb1x00.c
au1000_xxs1500.c
cardbus.c
cirrus.h
cistpl.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
cs_internal.h	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
cs.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
ds_internal.h	[PATCH] pcmcia: remove export of pcmcia_release_configuration	2006-03-31 17:15:53 +02:00
ds.c	[PATCH] pcmcia: fix pcmcia_device_remove oops	2006-03-31 17:30:51 +02:00
hd64465_ss.c
i82092.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
i82092aa.h
i82365.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
i82365.h
Kconfig	[PATCH] pcmcia: AT91RM9200 Compact Flash driver	2006-03-31 17:05:41 +02:00
m8xx_pcmcia.c
m32r_cfc.c
m32r_cfc.h
m32r_pcc.c
m32r_pcc.h
Makefile	[PATCH] pcmcia: AT91RM9200 Compact Flash driver	2006-03-31 17:05:41 +02:00
o2micro.h
omap_cf.c	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
pcmcia_ioctl.c	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
pcmcia_resource.c	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
pd6729.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
pd6729.h
pxa2xx_base.c
pxa2xx_base.h
pxa2xx_lubbock.c
pxa2xx_mainstone.c	[ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc	2006-01-10 17:16:12 +00:00
pxa2xx_sharpsl.c	[ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc	2006-01-10 17:16:12 +00:00
ricoh.h
rsrc_mgr.c	[PATCH] pcmcia: size reduction if ioctl isn't compiled	2006-03-31 17:02:39 +02:00
rsrc_nonstatic.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c
sa1100_cerf.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
sa1100_generic.c
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c
sa1111_generic.h
soc_common.c
soc_common.h
socket_sysfs.c	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
tcic.c
tcic.h
ti113x.h	[PATCH] pcmcia: remove include of config.h	2006-03-31 17:02:26 +02:00
topic.h
vg468.h
vrc4171_card.c	[PATCH] Don't pass boot parameters to argv_init[]	2006-03-31 12:18:53 -08:00
vrc4173_cardu.c	[PATCH] Don't pass boot parameters to argv_init[]	2006-03-31 12:18:53 -08:00
vrc4173_cardu.h
yenta_socket.c
yenta_socket.h