David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
fs_enet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-11-13 17:40:34 +09:00
fec_main.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
fec_mpc52xx_phy.c	net: fec_mpc52xx_phy: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00
fec_mpc52xx.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
fec_mpc52xx.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
fec_ptp.c	fec: Implement the SIOCGHWTSTAMP ioctl	2013-11-21 17:17:37 +00:00
fec.h	fec: Implement the SIOCGHWTSTAMP ioctl	2013-11-21 17:17:37 +00:00
fsl_pq_mdio.c	net: fsl_pq_mdio: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00
gianfar_ethtool.c	gianfar: Add flow control support	2013-08-13 15:28:53 -07:00
gianfar_ptp.c	powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file	2013-09-30 21:17:16 -07:00
gianfar_sysfs.c	gianfar: Use netdev_<level> when possible	2013-04-14 15:41:49 -04:00
gianfar.c	gianfar: Implement the SIOCGHWTSTAMP ioctl	2013-11-21 17:17:38 +00:00
gianfar.h	gianfar: Remove extern from function prototypes	2013-09-24 10:09:27 -04:00
Kconfig	NET: FEC: dynamtic check DMA desc buff type	2013-01-04 15:15:39 -08:00
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: freescale: remove unused compare_addr()	2013-12-26 13:31:32 -05:00
ucc_geth.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
xgmac_mdio.c	drivers: clean-up prom.h implicit includes	2013-10-09 20:04:04 -05:00