linux-sg2042/drivers/parport
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
BUGS-parport
Kconfig Parport driver: disable pc-style parport on Blackfin systems 2008-11-18 08:10:08 -08:00
Makefile [PATCH] AX88796 parallel port driver 2006-06-25 10:01:09 -07:00
TODO-parport
daisy.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ieee1284.c parport: ieee1284: use del_timer_sync() in parport_wait_event() 2009-01-06 15:59:31 -08:00
ieee1284_ops.c parport: fix ieee1284_epp_read_addr 2008-02-08 09:22:36 -08:00
multiface.h
parport_amiga.c [PARPORT] Consolidate code copies into a single generic irq handler 2007-10-23 19:53:15 -04:00
parport_atari.c m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
parport_ax88796.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_cs.c pcmcia: dev_node removal (write-only drivers) 2010-05-10 10:23:14 +02:00
parport_gsc.c parport: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
parport_gsc.h remove the bouncing email address of David Campbell 2006-06-26 18:19:23 +02:00
parport_ip32.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_mfc3.c m68k: parport_mfc3 - Not makes it a bool before the comparison. 2009-12-06 11:18:28 +01:00
parport_pc.c serial: 8250_pci: add support for MCS9865 / SYBA 6x Serial Port Card 2010-03-02 14:43:08 -08:00
parport_serial.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_sunbpp.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
probe.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
procfs.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
share.c parport: quickfix the proc registration bug 2009-06-02 09:53:22 -07:00