![]() Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
io.c | ||
iq81340mc.c | ||
iq81340sc.c | ||
irq.c | ||
msi.c | ||
pci.c | ||
setup.c | ||
tpmi.c |
![]() Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
io.c | ||
iq81340mc.c | ||
iq81340sc.c | ||
irq.c | ||
msi.c | ||
pci.c | ||
setup.c | ||
tpmi.c |