David S. Miller e561bb29b6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Trivial conflict in net/core/filter.c, a locally computed 'sdif' is now an argument to the function. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-11-28 22:10:54 -08:00
..
hns	net: ethernet: Convert phydev advertize and supported from u32 to link mode	2018-11-11 10:10:01 -08:00
hns3	net: hns3: Config NIC port speed same as that of optical module	2018-11-27 16:33:34 -08:00
hip04_eth.c	net: hisilicon: remove unexpected free_netdev	2018-11-28 10:41:15 -08:00
hisi_femac.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
hix5hd2_gmac.c	net: hns3: fix return type of ndo_start_xmit function	2018-09-18 20:01:25 -07:00
hns_mdio.c	net: hns: Fix a wrong op phy C45 code	2017-07-08 11:05:21 +01:00
Kconfig	net: hns3: give default option while dependency HNS3 set	2018-07-02 22:49:14 +09:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00