Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller 2017-05-18 16:11:32 -04:00
commit c6cd850d65
85 changed files with 664 additions and 368 deletions

View file

@ -139,10 +139,7 @@
#include <trace/events/sock.h>
#ifdef CONFIG_INET
#include <net/tcp.h>
#endif
#include <net/busy_poll.h>
static DEFINE_MUTEX(proto_list_mutex);