mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-12-06 07:31:49 +00:00
Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| hyperv_net.h | ||
| Kconfig | ||
| Makefile | ||
| netvsc_drv.c | ||
| netvsc.c | ||
| rndis_filter.c | ||