linux-stable/drivers/net/ethernet/hisilicon
David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-08-18 01:17:32 -04:00
..
hns Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-18 01:17:32 -04:00
hip04_eth.c hip04_eth: fix missing error handle for build_skb failed 2016-01-13 15:48:14 -05:00
hisi_femac.c net: hisilicon: Add Fast Ethernet MAC driver 2016-07-16 21:32:58 -07:00
hix5hd2_gmac.c net: ethernet: hix5hd2: use phy_ethtool_{get|set}_link_ksettings 2016-06-28 09:12:35 -04:00
hns_mdio.c net: hns: get reset registers from DT 2016-07-01 16:56:52 -04:00
Kconfig net: hisilicon: Add Fast Ethernet MAC driver 2016-07-16 21:32:58 -07:00
Makefile net: hisilicon: Add Fast Ethernet MAC driver 2016-07-16 21:32:58 -07:00