Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| bioscalls.c | ||
| core.c | ||
| Kconfig | ||
| Makefile | ||
| pnpbios.h | ||
| proc.c | ||
| rsparser.c | ||
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| bioscalls.c | ||
| core.c | ||
| Kconfig | ||
| Makefile | ||
| pnpbios.h | ||
| proc.c | ||
| rsparser.c | ||