FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 01:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a45b6f4f9e
linux/drivers/net/ibm_newemac
History
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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
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 ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts 2009-11-18 05:11:09 -08:00
Kconfig Merge commit 'origin' 2008-10-15 11:31:54 +11:00
Makefile
mal.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
mal.h net: Add init_dummy_netdev() and fix EMAC driver using it 2009-01-14 21:05:05 -08:00
phy.c net: variables reach -1, but 0 tested 2009-02-02 21:39:02 -08:00
phy.h ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY 2008-10-02 13:06:42 -04:00
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