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

Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx.c
Simple merge

diff --cc drivers/net/ethernet/ibm/emac/core.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_adminq.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40evf/i40e_adminq.c
Simple merge

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/ipv4/fib_frontend.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge