6dc6472581
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
|---|---|---|
| .. | ||
| isapnp | ||
| pnpacpi | ||
| pnpbios | ||
| Kconfig | ||
| Makefile | ||
| base.h | ||
| card.c | ||
| core.c | ||
| driver.c | ||
| interface.c | ||
| manager.c | ||
| quirks.c | ||
| resource.c | ||
| support.c | ||
| system.c | ||