David S. Miller 6dec4ac4ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/inet_diag.c		2011-11-26 14:47:03 -05:00
..
Kconfig	net: Revert ARCNET and PHYLIB to tristate options	2011-11-26 14:36:49 -05:00
Makefile	…
bcm63xx.c	…
broadcom.c	…
cicada.c	…
davicom.c	…
dp83640.c	dp83640: free packet queues on remove	2011-10-24 19:14:50 -04:00
dp83640_reg.h	…
et1011c.c	…
fixed.c	…
icplus.c	…
lxt.c	…
marvell.c	…
mdio-bitbang.c	mdio-gpio: Add reset functionality to mdio-gpio driver(v2).	2011-11-15 16:56:17 -05:00
mdio-gpio.c	mdio-gpio: Add reset functionality to mdio-gpio driver(v2).	2011-11-15 16:56:17 -05:00
mdio-octeon.c	…
mdio_bus.c	…
micrel.c	…
national.c	…
phy.c	…
phy_device.c	net: Change mii to ethtool advertisement function names	2011-11-21 15:27:19 -05:00
qsemi.c	…
realtek.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
smsc.c	…
ste10Xp.c	…
vitesse.c	…