mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-01 02:33:01 +09:00
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>