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
..
aha152x_core.c
aha152x_stub.c	pcmcia: pcmcia_config_loop() improvement by passing vcc	2008-08-23 01:22:52 +02:00
fdomain_core.c
fdomain_stub.c	pcmcia: pcmcia_config_loop() improvement by passing vcc	2008-08-23 01:22:52 +02:00
Kconfig	[SCSI] fix pcmcia compile problem	2008-01-23 11:29:34 -06:00
Makefile
nsp_cs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
nsp_cs.h	[SG] Update drivers to use sg helpers	2007-10-22 21:19:53 +02:00
nsp_debug.c	[SCSI] replace __FUNCTION__ with __func__	2008-07-27 10:31:49 -04:00
nsp_io.h
nsp_message.c	[SCSI] convert ninja driver to struct scsi_cmnd	2006-10-25 15:12:42 -07:00
qlogic_stub.c	pcmcia: pcmcia_config_loop() improvement by passing vcc	2008-08-23 01:22:52 +02:00
sym53c500_cs.c	pcmcia: pcmcia_config_loop() improvement by passing vcc	2008-08-23 01:22:52 +02:00