Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| chrp.h | ||
| gg2.h | ||
| Kconfig | ||
| Makefile | ||
| nvram.c | ||
| pci.c | ||
| pegasos_eth.c | ||
| setup.c | ||
| smp.c | ||
| time.c | ||
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| chrp.h | ||
| gg2.h | ||
| Kconfig | ||
| Makefile | ||
| nvram.c | ||
| pci.c | ||
| pegasos_eth.c | ||
| setup.c | ||
| smp.c | ||
| time.c | ||