85dcce7a73
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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
hyperv_net.h | ||
netvsc.c | ||
netvsc_drv.c | ||
rndis_filter.c |