Commits
![David S. Miller](https://secure.gravatar.com/avatar/81279c43ce60f56aea992763d1ed612b.jpg?s=96&d=mm)
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>