David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-07-03 14:55:13 -07:00
..
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
Makefile	mv643xx_eth: convert to use the Marvell Orion MDIO driver	2013-03-22 10:25:15 -04:00
mv643xx_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
mvmdio.c	net: mvmdio: get and enable optional clock	2013-04-08 16:55:26 -04:00
mvneta.c	net: mvneta: read MAC address from hardware when available	2013-06-04 17:23:51 -07:00
pxa168_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
skge.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
skge.h	skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers	2011-08-12 00:21:51 -07:00
sky2.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00