David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
Kconfig	net: ethernet: update dependency and help text of mvneta	2014-02-18 18:09:02 -05:00
Makefile	mv643xx_eth: convert to use the Marvell Orion MDIO driver	2013-03-22 10:25:15 -04:00
mv643xx_eth.c	net: mv643xx_eth: properly start/stop phy device	2013-12-17 14:42:43 -05:00
mvmdio.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
mvneta.c	net: introduce netdev_alloc_pcpu_stats() for drivers	2014-02-14 15:49:55 -05:00
pxa168_eth.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
skge.c	net: skge: remove unnecessary pci_set_drvdata()	2013-10-21 17:21:01 -04:00
skge.h
sky2.c	sky2: initialize napi before registering device	2014-01-27 16:39:53 -08:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00