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
..
3c574_cs.c	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
3c589_cs.c	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
axnet_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
com20020_cs.c	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
fmvj18x_cs.c	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
ibmtr_cs.c	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
Kconfig
Makefile
nmclan_cs.c	pcmcia: card services header cleanup	2008-08-31 15:25:47 +02:00
ositech.h
pcnet_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
smc91c92_cs.c	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
xirc2ps_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00