mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2026-08-07 16:06:48 +00:00
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| maple.h | ||
| pci.c | ||
| setup.c | ||
| time.c | ||