linux/drivers/net/ibm_newemac
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
..
core.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
core.h
debug.c of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
debug.h of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
emac.h
Kconfig
Makefile
mal.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
mal.h
phy.c
phy.h
rgmii.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
rgmii.h
tah.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
tah.h
zmii.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
zmii.h