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
..
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: add media-type property for hns	2016-07-01 16:56:52 -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	net: hns: mdio->irq is an array, so no need to check if it is null	2016-08-15 13:38:44 -07:00
hns_dsaf_mac.h	net: hns: add media-type property for hns	2016-07-01 16:56:52 -04:00
hns_dsaf_main.c	ethernet: hisilicon: hns: hns_dsaf_main: add missing of_node_put after calling of_parse_phandle	2016-08-01 21:43:48 -07:00
hns_dsaf_main.h	net: hns: add spin lock for tcam table operation	2016-06-21 04:51:55 -04:00
hns_dsaf_misc.c	net: hns: fix code style about hns driver	2016-07-01 16:56:51 -04:00
hns_dsaf_misc.h	net: hns: add dsaf misc operation method	2016-06-04 21:32:41 -04:00
hns_dsaf_ppe.c	net: hns: add dsaf misc operation method	2016-06-04 21:32:41 -04: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: change the default coalesce usecs	2016-06-21 04:51:56 -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: fix sbm default parameters config error	2016-06-21 04:51:56 -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	net: hns: add a space before "*/"	2016-07-01 16:56:52 -04:00
hns_enet.h	net: hns: enet specify a reference to dsaf by fwnode_handle	2016-06-04 21:32:40 -04:00
hns_ethtool.c	net: hns: add media-type property for hns	2016-07-01 16:56:52 -04:00
Makefile	net: add Hisilicon Network Subsystem basic ethernet support	2015-09-20 21:42:58 -07:00