Linus Torvalds 2be4ff2f08 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: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
at91_cf.c
au1000_db1x00.c
au1000_generic.c	pcmcia: encapsulate ioaddr_t	2008-08-29 09:43:14 +02:00
au1000_generic.h	pcmcia: encapsulate ioaddr_t	2008-08-29 09:43:14 +02:00
au1000_pb1x00.c	pcmcia: cs_internal.h is internal	2008-08-25 23:16:57 +02:00
au1000_xxs1500.c	pcmcia: cs_internal.h is internal	2008-08-25 23:16:57 +02:00
bfin_cf_pcmcia.c
cardbus.c	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
cirrus.h
cistpl.c	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
cs_internal.h	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
cs.c	pcmcia: card services header cleanup	2008-08-31 15:25:47 +02:00
ds.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
electra_cf.c
hd64465_ss.c	pcmcia: cs_internal.h is internal	2008-08-25 23:16:57 +02:00
i82092.c
i82092aa.h
i82365.c
i82365.h
Kconfig	Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm	2008-10-07 19:08:32 +01:00
m8xx_pcmcia.c
m32r_cfc.c
m32r_cfc.h
m32r_pcc.c
m32r_pcc.h
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
o2micro.h
omap_cf.c
pcmcia_ioctl.c	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
pcmcia_resource.c	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
pd6729.c
pd6729.h
pxa2xx_base.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_cm_x255.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_cm_x270.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_lubbock.c
pxa2xx_mainstone.c
pxa2xx_palmld.c
pxa2xx_palmtx.c
pxa2xx_sharpsl.c
pxa2xx_trizeps4.c	[ARM] pxa: trizeps4: remove unused variable	2008-10-07 15:52:03 +01:00
pxa2xx_viper.c	Add support for the Arcom/Eurotech Viper SBC CompactFlash card slot	2008-09-09 17:41:53 +02:00
ricoh.h
rsrc_mgr.c
rsrc_nonstatic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c
sa1100_cerf.c
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
soc_common.h	pcmcia: cs_internal.h is internal	2008-08-25 23:16:57 +02:00
socket_sysfs.c
tcic.c
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
yenta_socket.c
yenta_socket.h