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
..
fec.h	[PATCH] FS_ENET: use PAL for mii management	2006-08-19 17:44:31 -04:00
fs_enet-main.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
fs_enet.h	fs_enet: Add support for MPC512x to fs_enet driver	2010-02-27 02:34:35 -08:00
Kconfig	fs_enet: Add support for MPC512x to fs_enet driver	2010-02-27 02:34:35 -08:00
mac-fcc.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
mac-fec.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
mac-scc.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
Makefile	fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING code	2008-07-16 17:57:49 -05:00
mii-bitbang.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
mii-fec.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00