David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-29 18:48:54 -04: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	mv643xx_eth: Call dev_kfree_skb_any instead of dev_kfree_skb.	2014-03-24 21:19:05 -07:00
mvmdio.c	net: mvmdio: remove empty MDIO bus reset function	2014-03-28 01:38:02 -04:00
mvneta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04: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	skge: Call dev_kfree/consume_skb_any instead of dev_kfree_skb.	2014-03-24 21:19:05 -07:00
skge.h
sky2.c	sky2: Call dev_kfree_skb_any instead of dev_kfree_skb.	2014-03-24 21:19:06 -07:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00