linux_dsm_epyc7002/drivers/net/ethernet/stmicro/stmmac
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
..
chain_mode.c stmmac: code tidy-up 2013-04-08 16:55:27 -04:00
common.h stmicro: Remove extern from function prototypes 2013-09-24 12:54:08 -07:00
descs_com.h stmmac: code tidy-up 2013-04-08 16:55:27 -04:00
descs.h stmmac: code tidy-up 2013-04-08 16:55:27 -04:00
dwmac100_core.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
dwmac100_dma.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
dwmac100.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac1000_core.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
dwmac1000_dma.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
dwmac1000.h stmmac: code tidy-up 2013-04-08 16:55:27 -04:00
dwmac_dma.h stmicro: Remove extern from function prototypes 2013-09-24 12:54:08 -07:00
dwmac_lib.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
enh_desc.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
Kconfig net: Move MII out from under NET_CORE and hide it 2013-06-19 22:22:56 -07:00
Makefile stmmac: add the support for PTP hw clock driver 2013-03-26 12:53:37 -04:00
mmc_core.c stmmac: prevent interrupt loop with MMC RX IPC Counter 2013-04-11 16:03:22 -04:00
mmc.h stmicro: Remove extern from function prototypes 2013-09-24 12:54:08 -07:00
norm_desc.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
ring_mode.c net: stmmac: Fixed the condition of extend_desc for jumbo frame 2013-08-09 13:44:31 -07:00
stmmac_ethtool.c stmmac: add the support for PTP hw clock driver 2013-03-26 12:53:37 -04:00
stmmac_hwtstamp.c driver:stmmac: Adjust time stamp increase for 0.465 ns accurate only when Time stamp binary rollover is set. 2013-09-04 14:37:02 -04:00
stmmac_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
stmmac_mdio.c dt:net:stmmac: Add dt specific phy reset callback support. 2013-07-04 14:34:17 -07:00
stmmac_pci.c stmicro: make local variables static 2014-01-01 23:42:19 -05:00
stmmac_platform.c drivers: net: Mark functions as static in stmmac_platform.c 2013-12-19 18:51:20 -05:00
stmmac_ptp.c stmmac: Fix incorrect spinlock release and PTP cap detection. 2013-12-29 22:37:00 -05:00
stmmac_ptp.h stmmac: add IEEE PTPv1 and PTPv2 support. 2013-03-26 12:53:37 -04:00
stmmac.h stmicro: make local variables static 2014-01-01 23:42:19 -05:00