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
..
fs_enet	net: Move MII out from under NET_CORE and hide it	2013-06-19 22:22:56 -07:00
fec_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
fec_mpc52xx_phy.c
fec_mpc52xx.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
fec_mpc52xx.h
fec_ptp.c	fec: Only pass pdev in fec_ptp_init()	2013-06-07 14:41:07 -07:00
fec.h	fec: Add support for reading RMON registers	2013-06-26 15:45:14 -07:00
fsl_pq_mdio.c
gianfar_ethtool.c	net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*	2013-04-19 14:45:26 -04:00
gianfar_ptp.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
gianfar_sysfs.c	gianfar: Use netdev_<level> when possible	2013-04-14 15:41:49 -04:00
gianfar.c	gianfar: Add backwards compatible Single Queue mode polling	2013-06-12 03:16:20 -07:00
gianfar.h	gianfar: Remove superfluous kernel_dropped local counter	2013-03-21 12:01:34 -04:00
Kconfig
Makefile	net: fec: build fec.c and fec_ptp.c to one module	2013-03-25 12:14:57 -04:00
ucc_geth_ethtool.c	ucc_geth: Convert ugeth_<level> to pr_<level>	2013-04-14 15:41:49 -04:00
ucc_geth.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
ucc_geth.h
xgmac_mdio.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00