David S. Miller f6d3125fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/dsa/slave.c net/dsa/slave.c simply had overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-02 07:21:25 -07:00
..
hns	net: Fix Hisilicon Network Subsystem Support Compilation	2015-09-28 22:34:23 -07:00
hip04_eth.c	net: hisilicon: fix handling platform_get_irq result	2015-09-26 22:46:45 -07:00
hix5hd2_gmac.c	net: batch of last_rx update avoidance in ethernet drivers.	2015-05-14 17:38:17 -04:00
hns_mdio.c	net: add Hisilicon Network Subsystem MDIO support	2015-09-20 21:42:57 -07:00
Kconfig	net: add Hisilicon Network Subsystem basic ethernet support	2015-09-20 21:42:58 -07:00
Makefile	net: add Hisilicon Network Subsystem hnae framework support	2015-09-20 21:42:57 -07:00