Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| core.h | ||
| ct-ca9x4.c | ||
| headsmp.S | ||
| hotplug.c | ||
| Kconfig | ||
| localtimer.c | ||
| Makefile | ||
| Makefile.boot | ||
| platsmp.c | ||
| v2m.c | ||
Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| core.h | ||
| ct-ca9x4.c | ||
| headsmp.S | ||
| hotplug.c | ||
| Kconfig | ||
| localtimer.c | ||
| Makefile | ||
| Makefile.boot | ||
| platsmp.c | ||
| v2m.c | ||