linux/drivers/net/ethernet/hisilicon
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
hns Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-12-20 11:53:36 -08:00
hns3 net: hns3: remove redundant variable initialization 2018-12-19 23:47:59 -08:00
hip04_eth.c net: hisilicon: remove unexpected free_netdev 2018-11-28 10:41:15 -08:00
hisi_femac.c
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 hns3: prevent building without CONFIG_INET 2018-12-14 13:17:50 -08:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00