Archived
14
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/net/phy
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
..
bcm63xx.c
broadcom.c
cicada.c
davicom.c
et1011c.c
fixed.c
icplus.c
Kconfig
lxt.c
Makefile
marvell.c
mdio-bitbang.c
mdio-gpio.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
mdio-octeon.c
mdio_bus.c
micrel.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-05-12 00:05:35 -07:00
national.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
phy.c
phy_device.c
qsemi.c
realtek.c
smsc.c
ste10Xp.c
vitesse.c