Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| common.h | ||
| core.c | ||
| cpu.c | ||
| impd1.c | ||
| integrator_ap.c | ||
| integrator_cp.c | ||
| Kconfig | ||
| leds.c | ||
| lm.c | ||
| Makefile | ||
| Makefile.boot | ||
| pci.c | ||
| pci_v3.c | ||
Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c |
||
|---|---|---|
| .. | ||
| include/mach | ||
| common.h | ||
| core.c | ||
| cpu.c | ||
| impd1.c | ||
| integrator_ap.c | ||
| integrator_cp.c | ||
| Kconfig | ||
| leds.c | ||
| lm.c | ||
| Makefile | ||
| Makefile.boot | ||
| pci.c | ||
| pci_v3.c | ||