linux/drivers/net/ethernet/hisilicon/hns
David S. Miller 27058af401 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-10-30 12:42:58 -04:00
..
hnae.c net: hns: delete redundancy ring enable operations 2016-06-21 04:51:55 -04:00
hnae.h net: hns: add media-type property for hns 2016-07-01 16:56:52 -04:00
hns_ae_adapt.c net: hns: fix the bug of forwarding table 2016-10-03 11:40:57 -04:00
hns_dsaf_gmac.c net: hns: fix typo in g_gmac_stats_string[] 2016-08-10 17:57:50 -07:00
hns_dsaf_gmac.h
hns_dsaf_mac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-30 12:42:58 -04:00
hns_dsaf_mac.h net: hns: fix the bug of forwarding table 2016-10-03 11:40:57 -04:00
hns_dsaf_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-29 20:33:20 -07:00
hns_dsaf_main.h net: hns: fix port not available after testing loopback 2016-10-03 11:40:57 -04:00
hns_dsaf_misc.c net: hns: Add support of ACPI to HNS driver RoCE Reset function 2016-08-25 10:05:10 -04:00
hns_dsaf_misc.h net: hns: Add support of ACPI to HNS driver RoCE Reset function 2016-08-25 10:05:10 -04:00
hns_dsaf_ppe.c net: hns: dereference ppe_cb->ppe_common_cb if it is non-null 2016-08-26 11:44:56 -07:00
hns_dsaf_ppe.h net: hns: separate debug dsaf device from service dsaf device 2016-04-26 01:09:17 -04:00
hns_dsaf_rcb.c net: hns: bug fix about setting coalsecs-usecs to 0 2016-10-03 11:40:57 -04:00
hns_dsaf_rcb.h net: hns: change the default coalesce usecs 2016-06-21 04:51:56 -04:00
hns_dsaf_reg.h net: hns: bug fix about setting coalsecs-usecs to 0 2016-10-03 11:40:57 -04:00
hns_dsaf_xgmac.c net: hns: add dsaf misc operation method 2016-06-04 21:32:41 -04:00
hns_dsaf_xgmac.h
hns_enet.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-30 12:42:58 -04:00
hns_enet.h net: ethernet: hisilicon: hns: use phydev from struct net_device 2016-09-22 02:11:40 -04:00
hns_ethtool.c Updates to the hns drivers 2016-10-14 13:35:05 -07:00
Makefile