android_kernel_xiaomi_sm8350/drivers/parport
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
BUGS-parport
daisy.c
ieee1284_ops.c
ieee1284.c
Kconfig
Makefile
multiface.h
parport_amiga.c
parport_atari.c
parport_ax88796.c
parport_cs.c
parport_gsc.c
parport_gsc.h
parport_ip32.c
parport_mfc3.c
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
parport_sunbpp.c
probe.c
procfs.c
share.c
TODO-parport