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
..
2016-03-11 12:04:37 -05:00
2011-01-19 23:31:12 -08:00
2011-01-19 23:31:12 -08:00
2016-02-29 17:02:33 -05:00
2016-01-10 22:13:15 -05:00