mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 20:51:47 +00:00
143c905494
Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
block | ||
char | ||
cio | ||
crypto | ||
kvm | ||
net | ||
scsi | ||
Makefile |