David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
stmmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile