-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
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>
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authoredTwo 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:
Loading