tree 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6
parent 6f359f99b8c2ff3b09329611da00fe39a7c10e7e
parent d038e3dcfff6e3de132726a9c7174d8170032aa4
author David S. Miller <davem@davemloft.net> 1490307116 -0700
committer David S. Miller <davem@davemloft.net> 1490312487 -0700

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

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>