Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
|---|---|---|
| .. | ||
| include/plat | ||
| clock.c | ||
| Kconfig | ||
| Makefile | ||
| padmux.c | ||
| restart.c | ||
| shirq.c | ||
| time.c | ||
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
|---|---|---|
| .. | ||
| include/plat | ||
| clock.c | ||
| Kconfig | ||
| Makefile | ||
| padmux.c | ||
| restart.c | ||
| shirq.c | ||
| time.c | ||