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
..
Kconfig	can: mscan-mpc5xxx: add support for the MPC512x processor	2010-01-08 01:02:18 -08:00
Makefile	net/can/mscan: improve build	2009-11-17 03:57:34 -08:00
mpc5xxx_can.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
mscan.c	Fix some #includes in CAN drivers (rebased for net-next-2.6)	2010-04-13 03:32:42 -07:00
mscan.h	can: mscan-mpc5xxx: add support for the MPC512x processor	2010-01-08 01:02:18 -08:00