6dc6472581
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| hotplug | ||
| pcie | ||
| .gitignore | ||
| Kconfig | ||
| Makefile | ||
| access.c | ||
| bus.c | ||
| dma_remapping.h | ||
| dmar.c | ||
| hotplug-pci.c | ||
| hotplug.c | ||
| htirq.c | ||
| intel-iommu.c | ||
| intel-iommu.h | ||
| intr_remapping.c | ||
| intr_remapping.h | ||
| iova.c | ||
| iova.h | ||
| msi.c | ||
| msi.h | ||
| pci-acpi.c | ||
| pci-driver.c | ||
| pci-sysfs.c | ||
| pci.c | ||
| pci.h | ||
| probe.c | ||
| proc.c | ||
| quirks.c | ||
| remove.c | ||
| rom.c | ||
| search.c | ||
| setup-bus.c | ||
| setup-irq.c | ||
| setup-res.c | ||
| slot.c | ||
| syscall.c | ||