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	…
Makefile	…
TODO-parport	…
daisy.c	…
ieee1284.c	…
ieee1284_ops.c	…
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	…
parport_serial.c	…
parport_sunbpp.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
probe.c	…
procfs.c	…
share.c	…