mirror of https://github.com/torvalds/linux.git
0ddead90b2
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| unittest-data | ||
| Kconfig | ||
| Makefile | ||
| address.c | ||
| base.c | ||
| device.c | ||
| dynamic.c | ||
| fdt.c | ||
| fdt_address.c | ||
| irq.c | ||
| of_mdio.c | ||
| of_net.c | ||
| of_numa.c | ||
| of_pci.c | ||
| of_pci_irq.c | ||
| of_private.h | ||
| of_reserved_mem.c | ||
| overlay.c | ||
| pdt.c | ||
| platform.c | ||
| resolver.c | ||
| unittest.c | ||