mirror of
https://github.com/torvalds/linux.git
synced 2025-11-05 19:19:43 +02: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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| virtio.c | ||
| virtio_balloon.c | ||
| virtio_input.c | ||
| virtio_mmio.c | ||
| virtio_pci_common.c | ||
| virtio_pci_common.h | ||
| virtio_pci_legacy.c | ||
| virtio_pci_modern.c | ||
| virtio_ring.c | ||