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 | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
board-nhk8815.c | ||
clock.c | ||
clock.h | ||
cpu-8815.c | ||
cpu-8815.h | ||
i2c-8815nhk.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 | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
board-nhk8815.c | ||
clock.c | ||
clock.h | ||
cpu-8815.c | ||
cpu-8815.h | ||
i2c-8815nhk.c |