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/intel/e1000
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
..
e1000_ethtool.c e1000: configure and read MDI settings 2012-08-21 01:25:34 -07:00
e1000_hw.c drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:46 -07:00
e1000_hw.h e1000: Adding e1000_dump function 2012-02-07 04:01:46 -08:00
e1000_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
e1000_osdep.h intel: Move the Intel wired LAN drivers 2011-08-10 20:03:27 -07:00
e1000_param.c intel: Move the Intel wired LAN drivers 2011-08-10 20:03:27 -07:00
e1000.h e1000: Adding e1000_dump function 2012-02-07 04:01:46 -08:00
Makefile intel: Move the Intel wired LAN drivers 2011-08-10 20:03:27 -07:00