Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
|---|---|---|
| .. | ||
| mach | ||
Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
|---|---|---|
| .. | ||
| mach | ||