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> |
||
|---|---|---|
| .. | ||
| cgroup | ||
| firewire | ||
| hv | ||
| include/tools | ||
| lguest | ||
| lib | ||
| net | ||
| nfsd | ||
| perf | ||
| power | ||
| scripts | ||
| testing | ||
| thermal/tmon | ||
| usb | ||
| virtio | ||
| vm | ||
| Makefile | ||