tree 87302af9e03ee50cf135cc9ce6589f41fe3b3db1
parent ae3e4562e2ce0149a4424c994a282955700711e7
parent bc86765181aa26cc9afcb0a6f9f253cbb1186f26
author David S. Miller <davem@davemloft.net> 1467826522 -0700
committer David S. Miller <davem@davemloft.net> 1467826522 -0700

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

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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