David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
hns	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
hip04_eth.c	net: hisilicon: fix handling platform_get_irq result	2015-09-26 22:46:45 -07:00
hix5hd2_gmac.c	net: hix5hd2_gmac: avoid integer overload warning	2015-10-18 20:01:08 -07:00
hns_mdio.c	net: hisilicon: deals with the sub ctrl by syscon	2015-10-22 07:19:36 -07:00
Kconfig	net: hisilicon: NET_VENDOR_HISILICON should depend on HAS_DMA	2015-11-09 11:19:29 -05:00
Makefile	net: add Hisilicon Network Subsystem hnae framework support	2015-09-20 21:42:57 -07:00