Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
---|---|---|
.. | ||
include/mach | ||
core.c | ||
core.h | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
pci.c | ||
versatile_ab.c | ||
versatile_dt.c | ||
versatile_pb.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/mach | ||
core.c | ||
core.h | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
pci.c | ||
versatile_ab.c | ||
versatile_dt.c | ||
versatile_pb.c |