AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
6a06e5e1bb
linux_dsm_epyc7002/drivers/net/ethernet/stmicro/stmmac
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
chain_mode.c stmmac: add CHAINED descriptor mode support (V4) 2011-10-19 19:24:18 -04:00
common.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
descs_com.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
descs.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac100_core.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac100_dma.c stmmac: add mixed burst for DMA 2012-05-14 18:53:19 -04:00
dwmac100.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac1000_core.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac1000_dma.c stmmac: add mixed burst for DMA 2012-05-14 18:53:19 -04:00
dwmac1000.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac_dma.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac_lib.c stmmac: extend mac addr reg and fix perfect filering 2012-05-14 18:53:19 -04:00
enh_desc.c stmmac: sanitize the rx coe and add the type-1 csum (v2) 2012-04-04 18:39:23 -04:00
Kconfig stmmac: fix driver built w/ w/o both pci and platf modules 2012-06-07 22:46:48 -07:00
Makefile stmmac: add the experimental PCI support 2011-12-21 15:44:34 -05:00
mmc_core.c stmmac: fix a typo in the macro used to mask the mmc irq 2012-08-22 19:14:31 -07:00
mmc.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
norm_desc.c stmmac: sanitize the rx coe and add the type-1 csum (v2) 2012-04-04 18:39:23 -04:00
ring_mode.c stmmac: Fix for higher mtu size handling 2012-07-09 14:37:52 -07:00
stmmac_ethtool.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
stmmac_main.c net/stmmac: Use clk_prepare_enable and clk_disable_unprepare 2012-09-21 14:59:52 -04:00
stmmac_mdio.c net:stmmac: Remove bus_id from mdio platform data. 2012-08-31 16:11:28 -04:00
stmmac_pci.c net:stmmac: Remove bus_id from mdio platform data. 2012-08-31 16:11:28 -04:00
stmmac_platform.c net:stmmac: convert driver to use devm_request_and_ioremap. 2012-08-31 16:11:37 -04:00
stmmac_timer.c net/stmmac: Use clk_prepare_enable and clk_disable_unprepare 2012-09-21 14:59:52 -04:00
stmmac_timer.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
stmmac.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00