mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
6dc6472581
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
---|---|---|
.. | ||
isapnp | ||
pnpacpi | ||
pnpbios | ||
base.h | ||
card.c | ||
core.c | ||
driver.c | ||
interface.c | ||
Kconfig | ||
Makefile | ||
manager.c | ||
quirks.c | ||
resource.c | ||
support.c | ||
system.c |