Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| cgroup | ||
| firewire | ||
| hv | ||
| include | ||
| lguest | ||
| lib | ||
| net | ||
| nfsd | ||
| perf | ||
| power | ||
| scripts | ||
| testing | ||
| thermal/tmon | ||
| usb | ||
| virtio | ||
| vm | ||
| Makefile | ||