mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-20 16:30:53 +00:00
6dc6472581
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| acpi_pcihp.c | ||
| acpiphp_core.c | ||
| acpiphp_glue.c | ||
| acpiphp_ibm.c | ||
| acpiphp.h | ||
| cpci_hotplug_core.c | ||
| cpci_hotplug_pci.c | ||
| cpci_hotplug.h | ||
| cpcihp_generic.c | ||
| cpcihp_zt5550.c | ||
| cpcihp_zt5550.h | ||
| cpqphp_core.c | ||
| cpqphp_ctrl.c | ||
| cpqphp_nvram.c | ||
| cpqphp_nvram.h | ||
| cpqphp_pci.c | ||
| cpqphp_sysfs.c | ||
| cpqphp.h | ||
| fakephp.c | ||
| ibmphp_core.c | ||
| ibmphp_ebda.c | ||
| ibmphp_hpc.c | ||
| ibmphp_pci.c | ||
| ibmphp_res.c | ||
| ibmphp.h | ||
| Kconfig | ||
| Makefile | ||
| pci_hotplug_core.c | ||
| pciehp_core.c | ||
| pciehp_ctrl.c | ||
| pciehp_hpc.c | ||
| pciehp_pci.c | ||
| pciehp.h | ||
| pcihp_skeleton.c | ||
| rpadlpar_core.c | ||
| rpadlpar_sysfs.c | ||
| rpadlpar.h | ||
| rpaphp_core.c | ||
| rpaphp_pci.c | ||
| rpaphp_slot.c | ||
| rpaphp.h | ||
| sgi_hotplug.c | ||
| shpchp_core.c | ||
| shpchp_ctrl.c | ||
| shpchp_hpc.c | ||
| shpchp_pci.c | ||
| shpchp_sysfs.c | ||
| shpchp.h | ||