You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
BUGS-parport	…
ChangeLog	…
Kconfig	…
Makefile	…
TODO-parport	…
daisy.c	…
ieee1284.c	parport: remove superfluous local variable	17 years ago
ieee1284_ops.c	…
multiface.h	…
parport_amiga.c	…
parport_atari.c	…
parport_ax88796.c	…
parport_cs.c	pcmcia: pcmcia_config_loop() improvement by passing vcc	17 years ago
parport_gsc.c	…
parport_gsc.h	…
parport_ip32.c	…
parport_mfc3.c	…
parport_pc.c	parport_pc: add base_hi BAR for oxsemi_840	17 years ago
parport_serial.c	…
parport_sunbpp.c	sparc: Annotate of_device_id arrays with const or __initdata.	17 years ago
probe.c	…
procfs.c	parport/share.c: proper externs	17 years ago
share.c	…