linux_dsm_epyc7002/drivers/net/ethernet/amd
David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-01-28 10:33:06 -05:00
..
xgbe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-01-28 10:33:06 -05:00
7990.c ethernet: amd: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
7990.h net/7990: Make lance_private.name const 2013-12-29 00:46:38 -05:00
a2065.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
a2065.h
am79c961a.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
am79c961a.h
amd8111e.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
amd8111e.h ethernet: codespell comment spelling fixes 2015-03-08 22:54:22 -04:00
ariadne.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
ariadne.h
atarilance.c net: atarilance: use %8ph for printing hex string 2016-12-02 12:03:35 -05:00
au1000_eth.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
au1000_eth.h net: ethernet: amd: au1000_eth: use phydev from struct net_device 2016-07-15 16:41:35 -07:00
declance.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
hplance.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
hplance.h
Kconfig Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-12-12 19:56:15 -08:00
lance.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
Makefile amd-xgbe: Configuration and build support 2014-06-05 15:26:51 -07:00
mvme147.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
ni65.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
ni65.h
nmclan_cs.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
pcnet32.c net: amd: pcnet32: use new api ethtool_{get|set}_link_ksettings 2016-11-09 13:25:13 -05:00
sun3lance.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
sunlance.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00