Linus Torvalds 1685e633b3 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: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes		2010-08-06 12:25:06 -07:00
..
BUGS-parport
daisy.c
ieee1284_ops.c
ieee1284.c
Kconfig
Makefile
multiface.h
parport_amiga.c	m68k: amiga - Parallel port platform device conversion	2010-05-26 19:51:09 +02:00
parport_atari.c
parport_ax88796.c
parport_cs.c	pcmcia: do not use io_req_t when calling pcmcia_request_io()	2010-08-03 09:04:11 +02:00
parport_gsc.c
parport_gsc.h
parport_ip32.c
parport_mfc3.c
parport_pc.c
parport_serial.c
parport_sunbpp.c	of/platform: remove all of_bus_type and of_platform_bus_type references	2010-07-24 09:57:52 -06:00
probe.c
procfs.c
share.c
TODO-parport