tree 9e4be11c49a4405c19ece8f81fbb1db478da1055
parent bb1182bc3e5956a93ab3ef8a3cbfb7966c42a94a
parent bc78d646e708dabd1744ca98744dea316f459497
author David S. Miller <davem@davemloft.net> 1501607270 -0700
committer David S. Miller <davem@davemloft.net> 1501607270 -0700

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

Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).

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